Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix some issues with studio build" into sc-v2-dev am: 95ae739101

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15690096

Change-Id: I8a3b1fc69480023cb4f421d0526256f3702ee4ef
This commit is contained in:
Winson Chung
2021-08-27 18:49:44 +00:00
committed by Automerger Merge Worker
parent e7bbb2e88c 95ae739101
commit 777db52211
6 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/res/color/settingslib_state_off.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:color="?androidprv:attr/colorAccentSecondaryVariant"/>
</selector>

5
packages/SystemUI/res/color/settingslib_state_on.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:color="?androidprv:attr/colorAccentPrimary"/>
</selector>

5
packages/SystemUI/res/color/settingslib_track_off.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:color="?androidprv:attr/colorAccentSecondary"/>
</selector>

5
packages/SystemUI/res/color/settingslib_track_on.xml Normal file
View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
<item android:color="?androidprv:attr/colorAccentPrimaryVariant"/>
</selector>

8
packages/SystemUI/res/values/colors.xml
View File

@@ -286,13 +286,13 @@
<!-- Internet Dialog --> <!-- Internet Dialog -->
<!-- Material next state on color--> <!-- Material next state on color-->
<color name="settingslib_state_on_color">?androidprv:attr/colorAccentPrimary</color> <color name="settingslib_state_on_color">@color/settingslib_state_on</color>
<!-- Material next state off color--> <!-- Material next state off color-->
<color name="settingslib_state_off_color">?androidprv:attr/colorAccentSecondary</color> <color name="settingslib_state_off_color">@color/settingslib_state_off</color>
<!-- Material next track on color--> <!-- Material next track on color-->
<color name="settingslib_track_on_color">?androidprv:attr/colorAccentPrimaryVariant</color> <color name="settingslib_track_on_color">@color/settingslib_track_on</color>
<!-- Material next track off color--> <!-- Material next track off color-->
<color name="settingslib_track_off_color">?androidprv:attr/colorAccentSecondaryVariant</color> <color name="settingslib_track_off_color">@color/settingslib_track_off</color>
<color name="connected_network_primary_color">#191C18</color> <color name="connected_network_primary_color">#191C18</color>
<color name="connected_network_secondary_color">#41493D</color> <color name="connected_network_secondary_color">#41493D</color>
</resources> </resources>

2
packages/SystemUI/res/values/strings.xml
View File

@@ -2990,8 +2990,6 @@
<!-- Content description for a chip in the status bar showing that the user is currently on a phone call. [CHAR LIMIT=NONE] --> <!-- Content description for a chip in the status bar showing that the user is currently on a phone call. [CHAR LIMIT=NONE] -->
<string name="ongoing_phone_call_content_description">Ongoing phone call</string> <string name="ongoing_phone_call_content_description">Ongoing phone call</string>
<!-- Provider Model: Title of the airplane mode in the internet dialog. [CHAR LIMIT=50] -->
<string name="airplane_mode">Airplane mode</string>
<!-- Provider Model: Default title of the mobile network in the mobile layout. [CHAR LIMIT=50] --> <!-- Provider Model: Default title of the mobile network in the mobile layout. [CHAR LIMIT=50] -->
<string name="mobile_data_settings_title">Mobile data</string> <string name="mobile_data_settings_title">Mobile data</string>
<!-- Provider Model: Summary text separator for preferences including a short description <!-- Provider Model: Summary text separator for preferences including a short description