Skip to content
This repository was archived by the owner on Apr 22, 2024. It is now read-only.

Commit a6705f6

Browse files
luca020400luca020400
committed
Merge tag 'android-10.0.0_r31' into lineage-17.1-android-10.0.0_r31
Android 10.0.0 release 31 * tag 'android-10.0.0_r31': (56 commits) Import translations. DO NOT MERGE Import translations. DO NOT MERGE Dark theme settings text Import translations. DO NOT MERGE Import translations. DO NOT MERGE Phone Info UI shows network type list which depends on RAT supported Import translations. DO NOT MERGE Create some strings for RTT setting Update the behavior of the Dark theme slice Remove permission bar chart in Privacy setting Add Tapjacking Protection for SettingsHomepageActivity Added horizontal seperator in Face Settings Add feature provider for face unlock Import translations. DO NOT MERGE Fix Settings crash when clicks Notifications Dark theme settings activity [DO NOT MERGE] Add country blacklist support [Wi-Fi] Fix transition mode problems Prevent accounts page directly opening in screen pinning mode Prevent accounts page directly opening in screen pinning mode ... Change-Id: I1cf7f04abfcb2b0ce0cfb663c6739da263ed37c5
2 parents a640ef5 + c364e9b commit a6705f6

File tree

660 files changed

+410758
-404765
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

660 files changed

+410758
-404765
lines changed

‎AndroidManifest.xml

+18
Original file line numberDiff line numberDiff line change
@@ -935,6 +935,24 @@
935935
android:value="true" />
936936
</activity>
937937

938+
<activity
939+
android:name="Settings$DarkThemeSettingsActivity"
940+
android:label="@string/dark_ui_auto_mode_title"
941+
android:enabled="true">
942+
<intent-filter android:priority="32">
943+
<action android:name="android.intent.action.MAIN" />
944+
<category android:name="com.android.settings.SHORTCUT" />
945+
</intent-filter>
946+
<intent-filter android:priority="1">
947+
<action android:name="android.settings.DARK_THEME_SETTINGS" />
948+
<category android:name="android.intent.category.DEFAULT" />
949+
</intent-filter>
950+
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
951+
android:value="com.android.settings.display.darkmode.DarkModeSettingsFragment" />
952+
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
953+
android:value="true" />
954+
</activity>
955+
938956
<activity
939957
android:name="Settings$NightDisplaySuggestionActivity"
940958
android:enabled="@*android:bool/config_nightDisplayAvailable"

‎res/layout/advanced_bt_entity_sub.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@
5151
android:orientation="horizontal">
5252
<ImageView
5353
android:id="@+id/bt_battery_icon"
54-
android:layout_width="13dp"
55-
android:layout_height="20dp"/>
54+
android:layout_width="wrap_content"
55+
android:layout_height="wrap_content"
56+
android:layout_gravity="center"/>
5657
<TextView
5758
android:id="@+id/bt_battery_summary"
5859
style="@style/TextAppearance.EntityHeaderSummary"

‎res/layout/battery_header.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,10 @@
4444
android:layout_width="match_parent"
4545
android:layout_height="wrap_content"
4646
android:layout_marginTop="8dp"
47-
android:minLines="2"
47+
android:minLines="3"
4848
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
4949
android:textColor="?android:attr/textColorPrimary"/>
5050

51-
<TextView
52-
android:id="@+id/summary2"
53-
android:layout_width="match_parent"
54-
android:layout_height="wrap_content"
55-
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"/>
56-
android:textColor="?android:attr/textColorPrimary"/>
5751
</LinearLayout>
5852

5953
<com.android.settings.fuelgauge.BatteryMeterView

‎res/layout/dark_ui_activation_button.xml

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
Copyright (C) 2019 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
18+
<LinearLayout
19+
xmlns:android="http://schemas.android.com/apk/res/android"
20+
android:layout_width="match_parent"
21+
android:layout_height="wrap_content"
22+
android:minHeight="?android:attr/listPreferredItemHeight">
23+
24+
<Button
25+
android:id="@+id/dark_ui_turn_on_button"
26+
style="@style/ActionPrimaryButton"
27+
android:layout_marginStart="@dimen/screen_margin_sides"
28+
android:layout_width="wrap_content"
29+
android:layout_height="wrap_content"
30+
android:layout_gravity="center_vertical" />
31+
32+
<Button
33+
android:id="@+id/dark_ui_turn_off_button"
34+
style="@style/ActionSecondaryButton"
35+
android:layout_marginStart="@dimen/screen_margin_sides"
36+
android:layout_width="wrap_content"
37+
android:layout_height="wrap_content"
38+
android:layout_gravity="center_vertical" />
39+
40+
</LinearLayout>

‎res/layout/face_enroll_introduction.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@
124124
android:layout_width="24dp"
125125
android:layout_height="wrap_content"/>
126126
<TextView
127+
android:id="@+id/face_enroll_introduction_footer_part_2"
127128
android:layout_width="match_parent"
128-
android:layout_height="wrap_content"
129-
android:text="@string/security_settings_face_enroll_introduction_footer_part_2"/>
129+
android:layout_height="wrap_content"/>
130130

131131
</LinearLayout>
132132

‎res/values-af-nokeys/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717
<resources xmlns:android="http://schemas.android.com/apk/res/android"
1818
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
19-
<string name="applications_settings_summary" msgid="6616938758022986257">"Bestuur programme"</string>
19+
<string name="applications_settings_summary" msgid="8268946051198375521">"Bestuur programme"</string>
2020
</resources>

0 commit comments

Comments
 (0)