diff options
| author | Roman Birg <roman@cyngn.com> | 2014-11-10 10:35:02 -0800 |
|---|---|---|
| committer | Adnan <adnan@cyngn.com> | 2014-11-19 15:54:00 -0800 |
| commit | fff0d2390d1fd91ee1d9caca3a37ffc959ac1231 (patch) | |
| tree | c9543acae3d4f3f6f7db940e73b139baebb13497 /src/com/android/launcher3/OverviewSettingsPanel.java | |
| parent | fc7b78a2af84012af65f36735ebcee4f24a22bc7 (diff) | |
| download | android_packages_apps_Trebuchet-fff0d2390d1fd91ee1d9caca3a37ffc959ac1231.tar.gz android_packages_apps_Trebuchet-fff0d2390d1fd91ee1d9caca3a37ffc959ac1231.tar.bz2 android_packages_apps_Trebuchet-fff0d2390d1fd91ee1d9caca3a37ffc959ac1231.zip | |
Revert Themes button to Settings button
Remove the themes button in the overview panel and add back
the Settings button instead.
Conflicts:
res/drawable-hdpi/ic_setting.png
res/drawable-hdpi/ic_setting_pressed.png
res/drawable-mdpi/ic_setting.png
res/drawable-mdpi/ic_setting_pressed.png
res/drawable-xhdpi/ic_setting.png
res/drawable-xhdpi/ic_setting_pressed.png
res/drawable-xxhdpi/ic_setting.png
res/drawable-xxhdpi/ic_setting_pressed.png
res/drawable/setting_button.xml
res/drawable/settings_button.xml
res/drawable/themes_button.xml
res/layout/settings_pane.xml
res/values/cm_strings.xml
src/com/android/launcher3/Launcher.java
src/com/android/launcher3/OverviewSettingsPanel.java
Change-Id: Ia7517b508ec99d5c8070b960e3de35bd9b7e36fa
Diffstat (limited to 'src/com/android/launcher3/OverviewSettingsPanel.java')
| -rw-r--r-- | src/com/android/launcher3/OverviewSettingsPanel.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java index a0cbc11ec..5f0c15e0a 100644 --- a/src/com/android/launcher3/OverviewSettingsPanel.java +++ b/src/com/android/launcher3/OverviewSettingsPanel.java @@ -15,8 +15,6 @@ public class OverviewSettingsPanel { public static final String ANDROID_SETTINGS = "com.android.settings"; public static final String ANDROID_PROTECTED_APPS = "com.android.settings.applications.ProtectedAppsActivity"; - public static final String THEME_SETTINGS = - "com.android.settings.Settings$ThemeSettingsActivity"; public static final int HOME_SETTINGS_POSITION = 0; public static final int DRAWER_SETTINGS_POSITION = 1; public static final int APP_SETTINGS_POSITION = 2; @@ -115,6 +113,9 @@ public class OverviewSettingsPanel { settingsButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View arg0) { + if (!mLauncher.getWorkspace().isSwitchingState()) { + mLauncher.startSettings(); + } } }); settingsButton.setOnTouchListener(mLauncher.getHapticFeedbackTouchListener()); |