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

Merge changes Ie4fd89a3,Ica428dbc,Id3d1e935 into oc-dr1-dev

Browse Source 
am: 6a6d63be45

Change-Id: Ia0425e5333b437970786255b0a1e513fedfcf0bd
This commit is contained in:
Lucas Dupin
2017-07-13 19:49:59 +00:00
committed by android-build-merger
parent 1cdcaa8cf3 6a6d63be45
commit b02198da14
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res-keyguard/values/styles.xml
View File

@@ -38,7 +38,7 @@
<item name="android:paddingBottom">-16dp</item>
</style>
<style name="Keyguard.ImageButton.NumPadEnter" parent="@android:style/Widget.ImageButton">
<item name="android:tint">?attr/bgProtectTextColor</item>
<item name="android:tint">@color/background_protected</item>
</style>
<style name="Widget.TextView.NumPadKey.Klondike" parent="Widget.TextView.NumPadKey">
<item name="android:textSize">12sp</item>

1
packages/SystemUI/res/values/styles.xml
View File

@@ -308,6 +308,7 @@
<item name="darkIconTheme">@style/DualToneDarkTheme</item>
<item name="bgProtectTextColor">?android:attr/textColorPrimaryInverse</item>
<item name="bgProtectSecondaryTextColor">?android:attr/textColorSecondaryInverse</item>
<item name="android:colorControlHighlight">?android:attr/textColorSecondaryInverse</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
</style>

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
View File

@@ -4596,11 +4596,13 @@ public class StatusBar extends SystemUI implements DemoMode,
try {
mOverlayManager.setEnabled("com.android.systemui.theme.lightwallpaper",
useDarkText, mCurrentUserId);
mStatusBarWindowManager.setKeyguardDark(useDarkText);
} catch (RemoteException e) {
Log.w(TAG, "Can't change theme", e);
}
}
// Make sure we have the correct navbar/statusbar colors.
mStatusBarWindowManager.setKeyguardDark(useDarkText);
}
private void updateDozingState() {