am 34656acb: Merge changes Ie7745ed2,I43d47589,Ie04279e2,I8426ace8,Id1195405, ... into lmp-docs
* commit '34656acb8fdb1473aec8bd437cd0644431a1e43f':
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/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
index 741cd26..9589008 100644
--- a/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
+++ b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/DetailActivity.java
@@ -65,8 +65,8 @@
* This could be done in the layout XML, but exposing it via static variables allows easy
* querying from other Activities
*/
- mHeaderImageView.setViewName(VIEW_NAME_HEADER_IMAGE);
- mHeaderTitle.setViewName(VIEW_NAME_HEADER_TITLE);
+ mHeaderImageView.setTransitionName(VIEW_NAME_HEADER_IMAGE);
+ mHeaderTitle.setTransitionName(VIEW_NAME_HEADER_TITLE);
// END_INCLUDE(detail_set_view_name)
loadItem(item);
diff --git a/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
index 3630990..9c51789 100644
--- a/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
+++ b/ui/activityscenetransition/ActivitySceneTransitionBasic/Application/src/main/java/com/example/android/activityscenetransitionbasic/MainActivity.java
@@ -135,8 +135,8 @@
* As we're in an adapter we need to set each view's name dynamically, using the
* item's ID so that the names are unique.
*/
- image.setViewName("grid:image:" + item.getId());
- name.setViewName("grid:name:" + item.getId());
+ image.setTransitionName("grid:image:" + item.getId());
+ name.setTransitionName("grid:name:" + item.getId());
// END_INCLUDE(grid_set_view_name)
return view;
diff --git a/ui/lists/CustomChoiceList/template-params.xml b/ui/lists/CustomChoiceList/template-params.xml
index b58c0ac..407aa0b 100644
--- a/ui/lists/CustomChoiceList/template-params.xml
+++ b/ui/lists/CustomChoiceList/template-params.xml
@@ -20,7 +20,7 @@
<package>com.example.android.customchoicelist</package>
<!-- change minSdk if needed-->
- <minSdk>3</minSdk>
+ <minSdk>4</minSdk>
<strings>
<intro>
diff --git a/ui/transition/BasicTransition/template-params.xml b/ui/transition/BasicTransition/template-params.xml
index 0da7567..2bacb7a 100644
--- a/ui/transition/BasicTransition/template-params.xml
+++ b/ui/transition/BasicTransition/template-params.xml
@@ -21,7 +21,6 @@
<!-- change minSdk if needed-->
<minSdk>19</minSdk>
- <compileSdkVersion>19</compileSdkVersion>
<strings>
<intro>
diff --git a/ui/window/AdvancedImmersiveMode/template-params.xml b/ui/window/AdvancedImmersiveMode/template-params.xml
index c081c66..2ed54fd 100644
--- a/ui/window/AdvancedImmersiveMode/template-params.xml
+++ b/ui/window/AdvancedImmersiveMode/template-params.xml
@@ -22,7 +22,6 @@
<!-- change minSdk if needed-->
<minSdk>4</minSdk>
- <compileSdkVersion>19</compileSdkVersion>
<strings>
<intro>
diff --git a/ui/window/BasicImmersiveMode/template-params.xml b/ui/window/BasicImmersiveMode/template-params.xml
index 1335908..cc663ab 100644
--- a/ui/window/BasicImmersiveMode/template-params.xml
+++ b/ui/window/BasicImmersiveMode/template-params.xml
@@ -19,11 +19,8 @@
<group>UI</group>
<package>com.example.android.basicimmersivemode</package>
-
-
<!-- change minSdk if needed-->
<minSdk>19</minSdk>
- <compileSdkVersion>19</compileSdkVersion>
<strings>
<intro>
diff --git a/ui/window/ImmersiveMode/template-params.xml b/ui/window/ImmersiveMode/template-params.xml
index e053d26..8959099 100644
--- a/ui/window/ImmersiveMode/template-params.xml
+++ b/ui/window/ImmersiveMode/template-params.xml
@@ -19,8 +19,6 @@
<group>UI</group>
<package>com.example.android.immersivemode</package>
- <compileSdkVersion>19</compileSdkVersion>
-
<!--TODO: change minSdk if needed-->
<minSdk>4</minSdk>