PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am aea9ae00: Merge "[WifiSetup] Fix colors during setup" into lmp-dev

Browse Source 
* commit 'aea9ae000441940842ba3ec9f93562b684eb9053':
  [WifiSetup] Fix colors during setup
This commit is contained in:
Maurice Lam
2014-08-12 20:25:21 +00:00
committed by Android Git Automerger
parent fb070ed76e aea9ae0004
commit a12d7ba2da
6 changed files with 90 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
res/drawable/wifi_signal_colored.xml Normal file
View File

@@ -0,0 +1,68 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2014 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"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<item settings:state_encrypted="true">
<level-list>
<item android:maxLevel="0">
<bitmap
android:src="@drawable/ic_wifi_lock_signal_1_light"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="1">
<bitmap
android:src="@drawable/ic_wifi_lock_signal_2_light"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="2">
<bitmap
android:src="@drawable/ic_wifi_lock_signal_3_light"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="3">
<bitmap
android:src="@drawable/ic_wifi_lock_signal_4_light"
android:tint="?attr/wifi_signal_color" />
</item>
</level-list>
</item>
<item settings:state_encrypted="false">
<level-list>
<item android:maxLevel="0">
<bitmap
android:src="@drawable/ic_wifi_signal_1_light"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="1">
<bitmap
android:src="@drawable/ic_wifi_signal_2_light"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="2">
<bitmap
android:src="@drawable/ic_wifi_signal_3_light"
android:tint="?attr/wifi_signal_color" />
</item>
<item android:maxLevel="3">
<bitmap
android:src="@drawable/ic_wifi_signal_4_light"
android:tint="?attr/wifi_signal_color" />
</item>
</level-list>
</item>
</selector>

2
res/layout/wifi_assistant_card.xml
View File

@@ -32,7 +32,7 @@
<ImageView
android:id="@+id/cardBackground"
android:background="@color/setup_add_wifi_network_text_color"
android:background="@color/wifi_assistant_color_accent"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"

11
res/values/colors.xml
View File

@@ -40,8 +40,12 @@
<color name="title_color">@android:color/holo_blue_light</color>
<color name="setup_divider_color_dark">#33ffffff</color>
<color name="setup_divider_color_light">#33000000</color>
<color name="setup_add_wifi_network_text_color">#ff009587</color>
<color name="setup_add_wifi_network_background_color">#ff009587</color>
<color name="setup_wizard_color_accent_dark">#ff00e4ff</color>
<color name="setup_wizard_color_accent_light">#ff00828e</color>
<color name="setup_wizard_wifi_color_dark">#ff00e4ff</color>
<color name="setup_wizard_wifi_color_light">#ff0096a6</color>
<color name="wifi_assistant_color_accent">#ff009587</color>
<color name="circle_avatar_frame_color">#ffffffff</color>
<color name="circle_avatar_frame_shadow_color">#80000000</color>
@@ -73,6 +77,9 @@
<color name="preference_background_color">@color/default_preference_background_color</color>
<color name="search_panel_list_background_color">@color/default_preference_background_color</color>
<color name="setup_wizard_preference_background_color_dark">@*android:color/background_material_dark</color>
<color name="setup_wizard_preference_background_color_light">@*android:color/background_material_light</color>
<!-- Default avatar colors -->
<color name="pink_500">#ffe91e63</color>
<color name="indigo_500">#ff3f51b5</color>

4
res/values/styles.xml
View File

@@ -192,7 +192,7 @@
<item name="android:paddingStart">@dimen/setup_list_no_icon_padding</item>
<item name="android:textAllCaps">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.Small</item>
<item name="android:textColor">@color/setup_add_wifi_network_text_color</item>
<item name="android:textColor">?android:attr/colorAccent</item>
</style>
<style name="wifi_item">
@@ -290,7 +290,7 @@
<style name="WifiAssistantButton">
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
<item name="android:textColor">@color/setup_add_wifi_network_text_color</item>
<item name="android:textColor">@color/wifi_assistant_color_accent</item>
</style>
<!-- Scrollbar style OUTSIDE_OVERLAY -->

13
res/values/themes.xml
View File

@@ -19,10 +19,12 @@
<attr name="ic_menu_moreoverflow" format="reference" />
<attr name="ic_wps" format="reference" />
<attr name="setup_divider_color" format="reference" />
<attr name="wifi_signal_color" format="reference" />
<attr name="wifi_signal" format="reference" />
<style name="SetupWizardWifiTheme" parent="android:Theme.Material.NoActionBar">
<item name="android:alertDialogTheme">@style/Theme.WifiDialog</item>
<item name="android:colorAccent">@color/setup_wizard_color_accent_dark</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -32,12 +34,14 @@
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
<item name="setup_divider_color">@color/setup_divider_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_dark</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_dark</item>
<item name="wifi_signal">@drawable/wifi_signal_colored</item>
<item name="preferenceBackgroundColor">@color/setup_wizard_preference_background_color_dark</item>
</style>
<style name="SetupWizardWifiTheme.Light" parent="android:Theme.Material.Light.NoActionBar">
<item name="android:alertDialogTheme">@style/Theme.Light.WifiDialog</item>
<item name="android:colorAccent">@color/setup_wizard_color_accent_light</item>
<item name="android:listPreferredItemPaddingEnd">@dimen/setup_wizard_margin_sides</item>
<item name="android:listPreferredItemPaddingStart">@dimen/setup_wizard_margin_sides</item>
<item name="android:windowBackground">?android:attr/colorBackground</item>
@@ -47,8 +51,9 @@
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_material</item>
<item name="ic_wps">@drawable/ic_wps_light</item>
<item name="setup_divider_color">@color/setup_divider_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal_light</item>
<item name="preferenceBackgroundColor">@drawable/preference_background</item>
<item name="wifi_signal_color">@color/setup_wizard_wifi_color_light</item>
<item name="wifi_signal">@drawable/wifi_signal_colored</item>
<item name="preferenceBackgroundColor">@color/setup_wizard_preference_background_color_light</item>
</style>
<style name="Theme.WifiDialog" parent="@*android:style/Theme.Material.Dialog.Alert">

1
src/com/android/settings/wifi/WifiSetupActivity.java
View File

@@ -218,6 +218,7 @@ public class WifiSetupActivity extends WifiPickerActivity
final Intent nextIntent = new Intent(ACTION_NEXT);
nextIntent.putExtra(EXTRA_SCRIPT_URI, intent.getStringExtra(EXTRA_SCRIPT_URI));
nextIntent.putExtra(EXTRA_ACTION_ID, intent.getStringExtra(EXTRA_ACTION_ID));
nextIntent.putExtra(EXTRA_THEME, intent.getStringExtra(EXTRA_THEME));
nextIntent.putExtra(EXTRA_RESULT_CODE, resultCode);
startActivityForResult(nextIntent, NEXT_REQUEST);
}