Commit Graph

84005 Commits

Author SHA1 Message Date
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
Yanting Yang
be4c5f078f Remove silky flag from homepage for official release
Remove the silky condition and clean up redundant files.

Bug: 183670633
Test: robotests & visual with turning on/off silky home
Change-Id: I9259108534935ed8551748b922098dd52043afc1
2021-05-14 17:52:53 +08:00
TreeHugger Robot
ce9fa721b3 Merge "Fix test case failed" into sc-dev am: 6cd4ad46d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542669

Change-Id: I6ff54cd597f4cee6ff864fc60165a0285b6a0480
2021-05-14 09:37:38 +00:00
Chiachang Wang
640a73376c Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: 5613be1465
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518468

Change-Id: I871b1788dc8b7ca47c133fe028e8e200890365a7
2021-05-14 09:37:23 +00:00
TreeHugger Robot
08eb23954c Merge "Wrap generating battery history keys into another method" into sc-dev am: 5c2a472b39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542665

Change-Id: If3946af373bfc92875e11d9a7a007823095a717a
2021-05-14 09:36:21 +00:00
TreeHugger Robot
6cd4ad46d2 Merge "Fix test case failed" into sc-dev 2021-05-14 09:35:18 +00:00
Chiachang Wang
5613be1465 Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev 2021-05-14 09:32:42 +00:00
Tim Peng
6cbeb65a05 [Rohan] Two battery level, but no charging status in Rohan Setting
-show/hide battery information by device type

Bug: 187692468
Test: atest AdvancedBluetoothDetailsHeaderControllerTest

Change-Id: I22b4f2cddaf1143dd48ffec2fa3114d685689633
2021-05-14 16:55:05 +08:00
Hugh Chen
3eb374adb4 Fix foreground Service background launch restriction
Remove setForeground() in BluetoothPairingService. Refactor
the behavior to not holding service in the background.

Bug: 184901840
Test: make RunSettingsRoboTests -j56
Change-Id: Iaeb96943971f55dbeb3dba4b06b28abe770ba3c2
2021-05-14 08:53:14 +00:00
TreeHugger Robot
5c2a472b39 Merge "Wrap generating battery history keys into another method" into sc-dev 2021-05-14 08:42:54 +00:00
ykhung
e8d1374ea2 Export a method for app info page to get last 24 battery history data
Bug: 188123855
Test: make SettingsRoboTests
Change-Id: I1953461c47a33c5951b94726e6eade21033a1403
2021-05-14 08:36:52 +00:00
Arc Wang
b61388d1f5 Fix hint text color contrast problem in LocalePickerWithRegionActivity
Set android:textColorHint textColorSecondary in Theme.Settings.

Bug: 147637981
Test: accessibility scanner
Change-Id: Ie3ef7e86909b75366c427ac5c6a90a9a02f0f660
2021-05-14 16:34:39 +08:00
Hugh Chen
c7dbd26fbf Fix test case failed
Fix ConnectedDeviceDashboardFragmentTest test case failed.

Bug: 187999771
Test: make RunSettingsRoboTests -j56
Change-Id: I7c2617d1305c3e648f14ba8982d716ef1034e66e
2021-05-14 16:23:35 +08:00
Stanley Wang
7ce00ee003 Merge "Guard the NPE on StartNow slice" into sc-dev am: f7cb316cd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515932

Change-Id: I8348206ad6d496b47a56015dcf758d0b42acb58a
2021-05-14 08:15:19 +00:00
Yi-Ling Chuang
3e9c576bb8 Apply transition on the back arrow on NotificationHistory page
When clicking on the back arrow from the action bar in the Notification
History page, the shared x-axis transition won't work.

The onOptionsItemSelected() overriden in the parent activity was
removed, so onNavigateUp() will get called. In the
NotificationHistoryActivity, onNavigateUp() has been overriden, and so
it will just call finish without any transition applied.

Hence, remove the override and just use the one define in
CollapsingToolbarBaseActivity where finishAfterTransition() is called.

Test: rebuild and click on the back arrow to see the transition
Fixes: 188126675
Change-Id: I34ff38ffcfb37d0471d325f2c31b726809fbd91f
2021-05-14 16:11:03 +08:00
Stanley Wang
f7cb316cd2 Merge "Guard the NPE on StartNow slice" into sc-dev 2021-05-14 07:39:38 +00:00
Stanley Wang
f2c664abd9 Guard the NPE on StartNow slice
Check if preference is null to avoid NPE when the StartNowPreferenceController
is called by slice.

Fixes: 187806890
Test: robotest
Change-Id: I84c1ee42bc1fd87dd720061e3af81e926028181d
2021-05-14 07:38:41 +00:00
ykhung
637d34ed71 Wrap generating battery history keys into another method
Bug: 188123855
Test: make SettingsRoboTests
Change-Id: I82a48e66ec4f7b4c0d9a6756799aa8d7a3a96848
2021-05-14 07:21:09 +00:00
Chiachang Wang
6a78464406 Replace clearAll with withoutDefaultCapabilities
Replace the API as the feedback from API review.

Bug: 184735772
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=ContextualWifiSliceTest

Change-Id: I18f0776b6522489bf7e88f984bc44f23d8c9edc4
2021-05-14 15:08:00 +08:00
TreeHugger Robot
286d3289ff Merge "Add divider below ActionButtonPreference in BluetoothDetailFragment" into sc-dev am: f6712e330a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439452

Change-Id: I2825dfc54b59fe5956524c7dc10a893f3ed122c7
2021-05-14 06:25:01 +00:00
TreeHugger Robot
f6712e330a Merge "Add divider below ActionButtonPreference in BluetoothDetailFragment" into sc-dev 2021-05-14 06:12:41 +00:00
Treehugger Robot
034091db38 Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d am: a2dc65e71e am: 68b3473610 am: d70199e634
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889

Change-Id: I9a6592759b210d32fb7393088f0370144cb96208
2021-05-14 05:24:02 +00:00