summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoman Birg <roman@cyngn.com>2014-11-10 18:35:02 (GMT)
committerAdnan <adnan@cyngn.com>2014-11-19 23:54:00 (GMT)
commitfff0d2390d1fd91ee1d9caca3a37ffc959ac1231 (patch)
treec9543acae3d4f3f6f7db940e73b139baebb13497
parentfc7b78a2af84012af65f36735ebcee4f24a22bc7 (diff)
downloadandroid_packages_apps_Trebuchet-fff0d2390d1fd91ee1d9caca3a37ffc959ac1231.zip
android_packages_apps_Trebuchet-fff0d2390d1fd91ee1d9caca3a37ffc959ac1231.tar.gz
android_packages_apps_Trebuchet-fff0d2390d1fd91ee1d9caca3a37ffc959ac1231.tar.bz2
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
-rwxr-xr-xres/drawable/settings_button.xml21
-rwxr-xr-x[-rw-r--r--]res/layout/settings_pane.xml0
-rw-r--r--src/com/android/launcher3/Launcher.java9
-rw-r--r--src/com/android/launcher3/OverviewSettingsPanel.java5
4 files changed, 33 insertions, 2 deletions
diff --git a/res/drawable/settings_button.xml b/res/drawable/settings_button.xml
new file mode 100755
index 0000000..4d66a1a
--- /dev/null
+++ b/res/drawable/settings_button.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_focused="true" android:drawable="@drawable/ic_setting_pressed" />
+ <item android:state_pressed="true" android:drawable="@drawable/ic_setting_pressed" />
+ <item android:drawable="@drawable/ic_setting" />
+</selector>
diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml
index e12839e..e12839e 100644..100755
--- a/res/layout/settings_pane.xml
+++ b/res/layout/settings_pane.xml
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 9cc28dc..e82f5b0 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -1403,6 +1403,15 @@ public class Launcher extends Activity
popupMenu.show();
}
+ protected void startSettings() {
+ Intent settings;
+ settings = new Intent(android.provider.Settings.ACTION_SETTINGS);
+ startActivity(settings);
+ if (mWorkspace.isInOverviewMode()) {
+ mWorkspace.exitOverviewMode(false);
+ }
+ }
+
public interface QSBScroller {
public void setScrollY(int scrollY);
}
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index a0cbc11..5f0c15e 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());