Commit Graph

83626 Commits

Author SHA1 Message Date
YUKAI HUNG
d200b49007 Merge "Load application icon and label for UID battery consumer type" into sc-dev am: a73e40cb74 am: c4f0c1285d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185087

Change-Id: Ia6f0b6b3e327aad010bfb8e49ef2dc85215908dc
2021-05-16 08:36:03 +00:00
Julia Reynolds
7bdcfb7157 Only one action bar needed am: 98b8716e0a am: dc1dd5dc48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14189470

Change-Id: I19076d288ffe90c1d3fba03a92673a79c35e1443
2021-05-16 08:35:58 +00:00
Julia Reynolds
98c4f56815 Merge "Restyle notif history to beter match shade" into sc-dev am: a12666a3ad am: 5d99e1c19a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14188053

Change-Id: Ib5226d3a5e9726d93a7c1aa8fcb460d76eaa30a7
2021-05-16 08:35:53 +00:00
TreeHugger Robot
5451cf2c96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0ba20b96bb -s ours am: 748e873747 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187886

Change-Id: I24b51271c5d16fd8209154f30cbede2b616158f8
2021-05-16 08:35:34 +00:00
TreeHugger Robot
ed3f250cc5 Merge "Toggle Power + Volume chord with long press power to assist setting" into sc-dev am: d41c4d3c8c am: fa6b2b18a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172389

Change-Id: I4a1ed56f97af16086ea87043b7b7603b3f2251c5
2021-05-16 08:35:29 +00:00
Kevin Chyn
e1b99d0b36 Merge "Revert "Set ConfirmDeviceCredentialActivity non-external in FRP"" into sc-dev am: a328111013 am: e791667b57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172320

Change-Id: I6429eb962a136bf3707e59e16f39cca05765b049
2021-05-16 08:35:23 +00:00
Dmitri Plotnikov
7c55f2fcef Merge "Remove references to POWER_COMPONENT_USAGE and TIME_COMPONENT_USAGE" into sc-dev am: 3ac49f0a9b am: aea5d6a2b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14078240

Change-Id: I96e36058213c92d176f289e50c422ae25b9a0f1c
2021-05-16 08:35:17 +00:00
TreeHugger Robot
10b1e121da Merge "Replace the hidden API to public API or other alternatives" into sc-dev am: 5467d0f7aa am: 26bbbed015
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173731

Change-Id: I4305d88bfe83eed99103c16771da125cc2f71ae5
2021-05-16 08:35:11 +00:00
TreeHugger Robot
f0791b2196 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 42f8180428 -s ours am: 36055c1597 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14187486

Change-Id: I93fa9bf4805ab2f3af645de742f81d802ab172d4
2021-05-16 08:35:05 +00:00
Sally Yuen
55ed479c03 Merge "Call ColorDisplayManager for Extra Dim/RBC state" into sc-dev am: 182c812b1b am: aeaa13af9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172316

Change-Id: I36b47de615109233d1d0ab3393f15ac64514b2da
2021-05-16 08:35:00 +00:00
YUKAI HUNG
b7af91038e Merge "Avoid load icon and label in the background for periodic job" into sc-dev am: ec91ea48a3 am: f96d931b7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182162

Change-Id: Ie4e18682a6537a19dd53a870b410ac316179ff12
2021-05-16 08:34:53 +00:00
Lucas Lin
0fbdc29d28 Merge "Remove the usage of hidden API and fix the test" into sc-dev am: e231dc2b6f am: 00332cab6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185085

Change-Id: I9159d75558dd6954364f631807474602d11153d6
2021-05-16 08:34:48 +00:00
TreeHugger Robot
df9a707f45 Merge "Prevent failed dynamic index" into sc-dev am: 0c2eb1b553 am: 9d8e5a616c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185090

Change-Id: I767fe09230674eae727774de2557b96fa3d643d0
2021-05-16 08:34:42 +00:00
TreeHugger Robot
7dfa8bc454 Merge "Prevent HTML Injection on the Device Admin request screen" into sc-dev am: ede5041dd6 am: 072ec47b38
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167793

Change-Id: Ifa21ea668be2a79f2eddebfee3eafc16d37a3367
2021-05-16 08:34:36 +00:00
Yanting Yang
4abe3f6179 Merge "Use sentence case for display section subheaders" into sc-dev am: 2cfa6e5f39 am: f43c018442
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182156

Change-Id: Ie830d27dd4f0702d2c17bd3826209c564086ecdf
2021-05-16 08:34:30 +00:00
Tiffany Nguyen
62fa0be634 Merge "Revert "Update BatterySettingsFeatureProvider to an activity-friendly interface."" into sc-dev am: f9acbaf425 am: 54f957aad2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14185089

Change-Id: Ia7a8d814db5cd9c302c702d4fee26470671ec7d0
2021-05-16 08:34:24 +00:00
Tiffany Nguyen
0f3dfdca76 Merge "Update BatterySettingsFeatureProvider to an activity-friendly interface." into sc-dev am: ceb78586ee am: 828ca94277
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14172319

Change-Id: Ib20b7f04036e3e4e8d801436d91e482c2714df67
2021-05-16 08:34:18 +00:00
Jeremy Goldman
624c0de771 Merge "Add additional strings to differentiate between single and multiple insecure vpns" into sc-dev am: 21eaa6d568 am: 5ad687f487
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14182147

Change-Id: I2a3a0fd4eec9b79948a868b699008c0b2ccac3c5
2021-05-16 08:34:13 +00:00
Jack He
a543088d15 Merge "BT: Use DeviceConfig for Bluetooth GD toggle" am: 6de2953232 am: ee25171aa1 am: 130f27d48f am: ab38192a1f am: 2e22dcc7f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1661159

Change-Id: I4d1f3bffcf2168fe4d678e4cfe3e9400a9eecb7b
2021-05-16 08:34:07 +00:00
Ryan Lin
5d4c64f3a8 Merge "Show the illustration with the given button mode" into sc-dev am: 0e35a6fe07 am: a339d2796f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167785

Change-Id: I2f0b33c3a17425ec0be0bda4b5ccf34ec2e92bcc
2021-05-16 08:34:00 +00:00
TreeHugger Robot
869033b673 Merge "Add 50% opacity if detect there is no device image yet" into sc-dev am: c9cbe8a572 am: 606862ec21
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14140159

Change-Id: Id4470640db49ba79c3922d757a34eb53274b081c
2021-05-16 08:33:55 +00:00
YUKAI HUNG
bd85508ba4 Merge "Export loadNameAndIcon() method out for BatteryDiffEntry reusing." into sc-dev am: 9c68e56389 am: fabbc13d3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173736

Change-Id: If6dc55b12220729c312333b5467a082fb3aebd39
2021-05-16 08:33:49 +00:00
YUKAI HUNG
eb19235bef Merge "Load application icon and label from package manager if available" into sc-dev am: 8d8877b6db am: eb3e1282d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14167798

Change-Id: I31d2244c5d7a58f0a5097dd67d71c67f29069e79
2021-05-16 08:33:43 +00:00
Dmitri Plotnikov
a8775d10af Merge "Adjust for changing BatteryUsageStats constructor" into sc-dev am: 26db6e5f8e am: 6af2e84cd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14162520

Change-Id: I5893b00332e5711754bef8fc1b6288a1fb47ab5a
2021-05-16 08:33:37 +00:00
TreeHugger Robot
96e8466dd7 Merge "Update getOwnersForDomain usage to SortedSet" into sc-dev am: ea4ab07b63 am: f79708058a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14173190

Change-Id: Ibe9f13b19c087ddae24e10e56d12fab2323505f0
2021-05-16 08:33:31 +00:00
Sally Yuen
8345319373 Merge "Add a banner for RBC/Extra Dim" into sc-dev am: 12166e5bb1 am: 17cc9ffd93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14165431

Change-Id: I2caca9ca743f9e93e1eeac2ea47c33c8e487b1c6
2021-05-16 08:33:25 +00:00
Kevin Chyn
243fac8b04 Merge "Fingerprint image is not important for a11y announcements" into sc-dev am: 15d75cf59a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14537692

Change-Id: I6d41209657083dfec0f6d98666589a11ce2552c7
2021-05-14 21:26:24 +00:00
Kevin Chyn
15d75cf59a Merge "Fingerprint image is not important for a11y announcements" into sc-dev 2021-05-14 21:06:11 +00:00
TreeHugger Robot
148bdb9e65 Merge "Filter out SecuritySettings search results when alternative available." into sc-dev am: 8355121c28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14548182

Change-Id: I060170b10d230cd153d678b1e9c26c6ef56124d1
2021-05-14 19:50:34 +00:00
TreeHugger Robot
8355121c28 Merge "Filter out SecuritySettings search results when alternative available." into sc-dev 2021-05-14 19:33:01 +00:00
Yanting Yang
802af0f016 Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: Ic18f30f5f10d2e75d3f9aab119666ecc82091383
2021-05-14 18:34:37 +00:00
Yanting Yang
89cd044bd7 Merge "Remove silky flag from homepage for official release" into sc-dev 2021-05-14 18:13:29 +00:00
YUKAI HUNG
65b5d9706e Merge "Add battery usage metric" into sc-dev am: d2d7d89de6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14547065

Change-Id: I4a45edac90e4291bf32656f0944b5fa6a63fb3fd
2021-05-14 17:47:09 +00:00
YUKAI HUNG
d2d7d89de6 Merge "Add battery usage metric" into sc-dev 2021-05-14 17:22:10 +00:00
Abel Tesfaye
c045fb64e6 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137

Change-Id: Idf4555fc69ce3789881932482d701346a8935536
2021-05-14 16:12:22 +00:00
Abel Tesfaye
c077b490f4 Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev 2021-05-14 15:55:01 +00:00
ykhung
1ec8f04feb Add battery usage metric
Bug: 188046672
Test: make SettingsRoboTests
Change-Id: I1716913eee7c93cafd622052dcbca940c9726a17
2021-05-14 14:18:55 +00:00
Arc Wang
a486f770a6 Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525

Change-Id: I0665220f32173de9c21b1a3c79d20d60b48a85a7
2021-05-14 13:13:42 +00:00
Arc Wang
17b52da448 Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528

Change-Id: I52c854da8e487abb439d242730dd81994f94a16a
2021-05-14 13:13:34 +00:00
Arc Wang
c0d31a80d3 Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev 2021-05-14 12:59:11 +00:00
Arc Wang
20d45cc6f2 Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev 2021-05-14 12:58:36 +00:00
Jan Tomljanovic
e6070f9f0e Filter out SecuritySettings search results when alternative available.
When alternative fragment is shown for the security settings page, we
don't want to show search results that would lead to an unused security
settings page.

Test: manual
Test: atest SettingsUnitTests
Test: make RunSettingsRoboTests -j
Bug: 184613149
Change-Id: I525bd87d1ac6a24a7a26f59ae917e35ac39732e3
2021-05-14 11:52:12 +01:00
TreeHugger Robot
e0ec97aa7b Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev am: 5af530a054
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542668

Change-Id: I2a7e8610bf08ecc04bb6b8c074c65f4e553bb2d1
2021-05-14 10:26:10 +00:00
TreeHugger Robot
5af530a054 Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev 2021-05-14 10:18:46 +00:00
YUKAI HUNG
0af80557f5 Merge "Export a method for app info page to get last 24 battery history data" into sc-dev am: abd364e1f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542666

Change-Id: I796b670e161b2aecadf7fd9467ca31658226a1c1
2021-05-14 10:15:38 +00:00
YUKAI HUNG
abd364e1f3 Merge "Export a method for app info page to get last 24 battery history data" into sc-dev 2021-05-14 10:11:28 +00:00
TreeHugger Robot
ddc25f4d59 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev am: 0174c4bad0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515925

Change-Id: I300cff11f9e2a503c3e05788a9de9c5e2cab67bc
2021-05-14 10:03:18 +00:00
TreeHugger Robot
c62398d25b Merge "Fix foreground Service background launch restriction" into sc-dev am: 7c50995261
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542667

Change-Id: Icc1f6337114d35e1fc8e4eb1f8573a9cfec1ca79
2021-05-14 10:03:10 +00:00
TreeHugger Robot
0174c4bad0 Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev 2021-05-14 09:59:54 +00:00
TreeHugger Robot
7c50995261 Merge "Fix foreground Service background launch restriction" into sc-dev 2021-05-14 09:54:12 +00:00