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

Commit 7d35be74 authored by Bill Yi's avatar Bill Yi Committed by Gerrit Code Review
Browse files

Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE"

parents 1ea70d24 09be9fbb

AndroidManifest.xml

+18 −0
Original line number Diff line number Diff line
@@ -938,6 +938,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

tests/robotests/res/values-mcc999-af/config.xml→res/layout/dark_ui_activation_button.xml

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

<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2017 The Android Open Source Project

  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.
@@ -15,7 +15,26 @@ 
  limitations under the License.

  -->



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

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="config_grayscale_settings_intent" msgid="8735247517194403558">"voorneme:#Intent;action=test.test;end"</string>

</resources>
 
<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>