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

am 36fbc437: Merge "Use dark theme for usb dialogs on television." into lmp-mr1-dev

Browse Source 
* commit '36fbc43787923da4e7b36761fa287a36e15dab29':
  Use dark theme for usb dialogs on television.
This commit is contained in:
Craig Stout
2014-11-17 22:58:18 +00:00
committed by Android Git Automerger
parent 0e78487482 36fbc43787
commit 913f829549
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/AndroidManifest.xml
View File

@@ -211,7 +211,7 @@
<activity android:name=".usb.UsbConfirmActivity" <activity android:name=".usb.UsbConfirmActivity"
android:exported="true" android:exported="true"
android:permission="android.permission.MANAGE_USB" android:permission="android.permission.MANAGE_USB"
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" android:theme="@style/Theme.SystemUI.Dialog.Alert"
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
</activity> </activity>
@@ -220,7 +220,7 @@
<activity android:name=".usb.UsbPermissionActivity" <activity android:name=".usb.UsbPermissionActivity"
android:exported="true" android:exported="true"
android:permission="android.permission.MANAGE_USB" android:permission="android.permission.MANAGE_USB"
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" android:theme="@style/Theme.SystemUI.Dialog.Alert"
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
</activity> </activity>
@@ -229,7 +229,7 @@
<activity android:name=".usb.UsbResolverActivity" <activity android:name=".usb.UsbResolverActivity"
android:exported="true" android:exported="true"
android:permission="android.permission.MANAGE_USB" android:permission="android.permission.MANAGE_USB"
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" android:theme="@style/Theme.SystemUI.Dialog.Alert"
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
</activity> </activity>
@@ -238,7 +238,7 @@
<activity android:name=".usb.UsbAccessoryUriActivity" <activity android:name=".usb.UsbAccessoryUriActivity"
android:exported="true" android:exported="true"
android:permission="android.permission.MANAGE_USB" android:permission="android.permission.MANAGE_USB"
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" android:theme="@style/Theme.SystemUI.Dialog.Alert"
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
</activity> </activity>
@@ -246,7 +246,7 @@
<!-- started from UsbDebuggingManager --> <!-- started from UsbDebuggingManager -->
<activity android:name=".usb.UsbDebuggingActivity" <activity android:name=".usb.UsbDebuggingActivity"
android:permission="android.permission.MANAGE_USB" android:permission="android.permission.MANAGE_USB"
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" android:theme="@style/Theme.SystemUI.Dialog.Alert"
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:excludeFromRecents="true"> android:excludeFromRecents="true">
</activity> </activity>
@@ -266,7 +266,7 @@
<activity <activity
android:name=".media.MediaProjectionPermissionActivity" android:name=".media.MediaProjectionPermissionActivity"
android:exported="true" android:exported="true"
android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" android:theme="@style/Theme.SystemUI.Dialog.Alert"
android:finishOnCloseSystemDialogs="true" android:finishOnCloseSystemDialogs="true"
android:launchMode="singleTop" android:launchMode="singleTop"
android:excludeFromRecents="true" /> android:excludeFromRecents="true" />

19
packages/SystemUI/res/values-television/styles.xml Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2006 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.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Dialog.Alert" />
</resources>

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

@@ -228,6 +228,8 @@
<item name="android:colorControlActivated">@color/system_accent_color</item> <item name="android:colorControlActivated">@color/system_accent_color</item>
</style> </style>
<style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" />
<style name="QSBorderlessButton"> <style name="QSBorderlessButton">
<item name="android:padding">12dp</item> <item name="android:padding">12dp</item>
<item name="android:background">@drawable/btn_borderless_rect</item> <item name="android:background">@drawable/btn_borderless_rect</item>