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

Commit db691577 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114)... 

Merge "DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master" into stage-aosp-master
parents 83e2fa8b ccbee6a7

AndroidManifest.xml

+18 −0
Original line number Diff line number Diff line
@@ -936,6 +936,24 @@ 
                android:value="true" />

        </activity>



        <activity

                android:name="Settings$DarkThemeSettingsActivity"

                android:label="@string/dark_ui_auto_mode_title"

                android:enabled="true">

            <intent-filter android:priority="32">

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            <intent-filter android:priority="1">

                <action android:name="android.settings.DARK_THEME_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.display.darkmode.DarkModeSettingsFragment" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>



        <activity

            android:name="Settings$NightDisplaySuggestionActivity"

            android:enabled="@*android:bool/config_nightDisplayAvailable"

res/layout/advanced_bt_entity_sub.xml

+3 −2
Original line number Diff line number Diff line
@@ -51,8 +51,9 @@ 
        android:orientation="horizontal">

        <ImageView

            android:id="@+id/bt_battery_icon"

            android:layout_width="13dp"

            android:layout_height="20dp"/>

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"/>

        <TextView

            android:id="@+id/bt_battery_summary"

            style="@style/TextAppearance.EntityHeaderSummary"

res/layout/battery_header.xml

+1 −7
Original line number Diff line number Diff line
@@ -44,16 +44,10 @@ 
            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="8dp"

            android:minLines="2"

            android:minLines="3"

            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>

            android:textColor="?android:attr/textColorPrimary"/>



        <TextView

            android:id="@+id/summary2"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>

            android:textColor="?android:attr/textColorPrimary"/>

    </LinearLayout>



    <com.android.settings.fuelgauge.BatteryMeterView

res/layout/dark_ui_activation_button.xml

0 → 100644
+40 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2019 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.

  -->



<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:minHeight="?android:attr/listPreferredItemHeight">



    <Button

        android:id="@+id/dark_ui_turn_on_button"

        style="@style/ActionPrimaryButton"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical" />



    <Button

        android:id="@+id/dark_ui_turn_off_button"

        style="@style/ActionSecondaryButton"

        android:layout_marginStart="@dimen/screen_margin_sides"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical" />



</LinearLayout>
 
 No newline at end of file

res/layout/face_enroll_introduction.xml

+2 −2
Original line number Diff line number Diff line
@@ -124,9 +124,9 @@ 
                    android:layout_width="24dp"

                    android:layout_height="wrap_content"/>

                <TextView

                    android:id="@+id/face_enroll_introduction_footer_part_2"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:text="@string/security_settings_face_enroll_introduction_footer_part_2"/>

                    android:layout_height="wrap_content"/>



            </LinearLayout>