| commit | 34656acb8fdb1473aec8bd437cd0644431a1e43f | [log] [tgz] |
|---|---|---|
| author | Trevor Johns <trevorjohns@google.com> | Thu Nov 06 16:16:51 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Nov 06 16:16:51 2014 +0000 |
| tree | 50e0dae58527ca895c44e6fe26eb714b7cdd8455 | |
| parent | 6de1e868f6a43e097ad086df53e6e17b6c29a326 [diff] | |
| parent | d56bb4efeb27427663c46b6af3eb3fb28daca862 [diff] |
Merge changes Ie7745ed2,I43d47589,Ie04279e2,I8426ace8,Id1195405, ... into lmp-docs * changes: Remove compile-sdk constraints from ImmersiveMode sample Remove compile-sdk constraints from BasicImmersiveMode sample Remove compile-sdk constraints from AdvancedImmersiveMode sample Remove compile-sdk constraints from BasicTransition sample CustomChoiceList: Increment min-sdk to 4 ActivitySceneTransitionBasic: Update method calls for compatibility with API 21
diff --git a/wearable/wear/SynchronizedNotifications/Application/tests/src/com/example/android/synchronizednotifications/tests/SampleTests.java b/wearable/wear/SynchronizedNotifications/Application/tests/src/com/example/android/com/example/android/wearable/synchronizednotifications/tests/SampleTests.java similarity index 100% rename from wearable/wear/SynchronizedNotifications/Application/tests/src/com/example/android/synchronizednotifications/tests/SampleTests.java rename to wearable/wear/SynchronizedNotifications/Application/tests/src/com/example/android/com/example/android/wearable/synchronizednotifications/tests/SampleTests.java
diff --git a/wearable/wear/SynchronizedNotifications/Shared/src/main/java/com/example/android/wearable/synchronizednotifications/common/Constants.java b/wearable/wear/SynchronizedNotifications/Shared/src/main/java/com/example/android/wearable/synchronizednotifications/common/Constants.java index b85d2d1..2e1d46c 100644 --- a/wearable/wear/SynchronizedNotifications/Shared/src/main/java/com/example/android/wearable/synchronizednotifications/common/Constants.java +++ b/wearable/wear/SynchronizedNotifications/Shared/src/main/java/com/example/android/wearable/synchronizednotifications/common/Constants.java
@@ -33,5 +33,5 @@ public static final String KEY_CONTENT = "content"; public static final String ACTION_DISMISS - = "com.example.android.synchronizednotifications.DISMISS"; + = "com.example.android.wearable.synchronizednotifications.DISMISS"; }