diff options
| author | Raj Yengisetty <rajesh@cyngn.com> | 2014-11-10 10:35:00 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:53:57 -0800 |
| commit | 2d1bb4321c662ee7b192b90c9476d6293c1f4885 (patch) | |
| tree | b94bc7e48cb03ee8080ea1f3c548e69db131f5e9 /res/layout | |
| parent | 707d1538836e2a65c0a1bb0157617e44f3ec81a2 (diff) | |
| download | android_packages_apps_Trebuchet-2d1bb4321c662ee7b192b90c9476d6293c1f4885.tar.gz android_packages_apps_Trebuchet-2d1bb4321c662ee7b192b90c9476d6293c1f4885.tar.bz2 android_packages_apps_Trebuchet-2d1bb4321c662ee7b192b90c9476d6293c1f4885.zip | |
Remove old preference activity
* Also cleanup & remove unused strings
Conflicts:
AndroidManifest.xml
WallpaperPicker/src/com/android/launcher3/WallpaperPickerActivity.java
res/values/cm_strings.xml
Change-Id: I0b9f2405ab98b0df612a18ccfaa5d9ba98876d8a
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/settings_transitions_screen.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/res/layout/settings_transitions_screen.xml b/res/layout/settings_transitions_screen.xml index 23b3b37e9..9a517a947 100644 --- a/res/layout/settings_transitions_screen.xml +++ b/res/layout/settings_transitions_screen.xml @@ -27,7 +27,7 @@ android:id="@+id/transition_effect_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/transition_effect_button_text" + android:text="@string/scroll_effect_text" android:textAllCaps="true" android:textColor="@android:color/white" android:layout_gravity="center_vertical" @@ -48,4 +48,4 @@ android:layout_height="wrap_content" android:listSelector="@android:color/transparent" android:splitMotionEvents="false"/> -</LinearLayout>
\ No newline at end of file +</LinearLayout> |