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 /src | |
| 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 'src')
| -rw-r--r-- | src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java index 6c0b09bdd..dcf8801fe 100644 --- a/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java +++ b/src/com/android/launcher3/list/SettingsPinnedHeaderAdapter.java @@ -269,7 +269,7 @@ public class SettingsPinnedHeaderAdapter extends PinnedHeaderListAdapter { // If GEL integration is not supported, do not allow the user to turn it on. if(!current && !mLauncher.isGelIntegrationSupported()) { Toast.makeText(mLauncher.getApplicationContext(), - res.getString(R.string.preferences_search_screen_left_unsupported_toast), + res.getString(R.string.search_screen_left_unsupported_toast), Toast.LENGTH_SHORT).show(); } else { onSettingsBooleanChanged( |