Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 913f8295 authored by Craig Stout's avatar Craig Stout Committed by Android Git Automerger
Browse files

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

* commit '36fbc437':
  Use dark theme for usb dialogs on television.
parents 0e784874 36fbc437

packages/SystemUI/AndroidManifest.xml

+6 −6
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ 
        <activity android:name=".usb.UsbConfirmActivity"

            android:exported="true"

            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:excludeFromRecents="true">

        </activity>
@@ -220,7 +220,7 @@ 
        <activity android:name=".usb.UsbPermissionActivity"

            android:exported="true"

            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:excludeFromRecents="true">

        </activity>
@@ -229,7 +229,7 @@ 
        <activity android:name=".usb.UsbResolverActivity"

            android:exported="true"

            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:excludeFromRecents="true">

        </activity>
@@ -238,7 +238,7 @@ 
        <activity android:name=".usb.UsbAccessoryUriActivity"

            android:exported="true"

            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:excludeFromRecents="true">

        </activity>
@@ -246,7 +246,7 @@ 
        <!-- started from UsbDebuggingManager -->

        <activity android:name=".usb.UsbDebuggingActivity"

            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:excludeFromRecents="true">

        </activity>
@@ -266,7 +266,7 @@ 
        <activity

            android:name=".media.MediaProjectionPermissionActivity"

            android:exported="true"

            android:theme="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert"

            android:theme="@style/Theme.SystemUI.Dialog.Alert"

            android:finishOnCloseSystemDialogs="true"

            android:launchMode="singleTop"

            android:excludeFromRecents="true" />

packages/SystemUI/res/values-television/styles.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?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>

packages/SystemUI/res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -228,6 +228,8 @@ 
        <item name="android:colorControlActivated">@color/system_accent_color</item>

    </style>



    <style name="Theme.SystemUI.Dialog.Alert" parent="@*android:style/Theme.DeviceDefault.Light.Dialog.Alert" />



    <style name="QSBorderlessButton">

        <item name="android:padding">12dp</item>

        <item name="android:background">@drawable/btn_borderless_rect</item>