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 /res | |
| 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 'res')
| -rwxr-xr-x | res/drawable/settings_button.xml | 21 | ||||
| -rwxr-xr-x[-rw-r--r--] | res/layout/settings_pane.xml | 0 |
2 files changed, 21 insertions, 0 deletions
diff --git a/res/drawable/settings_button.xml b/res/drawable/settings_button.xml new file mode 100755 index 000000000..4d66a1ac7 --- /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 e12839e10..e12839e10 100644..100755 --- a/res/layout/settings_pane.xml +++ b/res/layout/settings_pane.xml |