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
8bfc40046e
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: I92fcdbabb74151b33dd71aacafddb81cff3fccda
2021-05-14 17:57:07 +00:00
YUKAI HUNG
d2d7d89de6
Merge "Add battery usage metric" into sc-dev
2021-05-14 17:22:10 +00:00
Abel Tesfaye
8a8ad35cd0
Merge "Fix issue where smart auto rotate toggle is not disabled" into sc-dev am: c077b490f4 am: 29a695b0c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14504137
Change-Id: Ida4f97953c22b8ea942f94557c95efb24e6f88db
2021-05-14 16:35:07 +00:00
Abel Tesfaye
29a695b0c7
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: I1f2cbcfe67614dbf8a9dba475f9a126cd25626b0
2021-05-14 16:14:03 +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
a3c6cd1cdd
Merge "Fix hint text color contrast problem in LocalePickerWithRegionActivity" into sc-dev am: c0d31a80d3 am: 5e0461e3a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540525
Change-Id: Ic1e1cb8d350b6f09cf5a50781177311c08107740
2021-05-14 13:28:35 +00:00
Arc Wang
5bbdc3b5b9
Merge "Fix NPE in DrawOverlayDetails#getSummary" into sc-dev am: 20d45cc6f2 am: 4418d9a31a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519528
Change-Id: I99d381076cdcec75f1a5f35f79374e3222af4b1c
2021-05-14 13:28:22 +00:00
Arc Wang
5e0461e3a2
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: I51af4157dad68a5d2bcb4c5b521d59f9b0e3e265
2021-05-14 13:15:33 +00:00
Arc Wang
4418d9a31a
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: I7acf8e2ae01291aab9ab5b603a608a70e9635010
2021-05-14 13:15:29 +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
152f48f839
Merge "Apply transition on the back arrow on NotificationHistory page" into sc-dev am: 5af530a054 am: 918af6c6a9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542668
Change-Id: Ic2bb5ab8562c6559effaebe1799354d7f46bf7ce
2021-05-14 10:25:31 +00:00
YUKAI HUNG
3fecf1fb17
Merge "Export a method for app info page to get last 24 battery history data" into sc-dev am: abd364e1f3 am: e1d946b9ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542666
Change-Id: I15a3ec4a2341f1baf0b226ee09cf10ca2e116a11
2021-05-14 10:25:21 +00:00
TreeHugger Robot
918af6c6a9
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: Ic4d79121d3dff25131d9cc1069c3a718721d2bcd
2021-05-14 10:20:00 +00:00
YUKAI HUNG
e1d946b9ec
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: I8597c0a87704f4ffc5e6051d586cddc75356a12c
2021-05-14 10:19:55 +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
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
c48f7caed4
Merge "[Rohan] Two battery level, but no charging status in Rohan Setting" into sc-dev am: 0174c4bad0 am: cb5bfc0d77
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515925
Change-Id: Ie0f75865eff3429d97b8b407b528ca0e77e2a062
2021-05-14 10:11:03 +00:00
TreeHugger Robot
431b7b06ad
Merge "Fix foreground Service background launch restriction" into sc-dev am: 7c50995261 am: 99553c187e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542667
Change-Id: I661574b1c88e542877b670b97c0ff93b44c19afe
2021-05-14 10:10:58 +00:00
TreeHugger Robot
cb5bfc0d77
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: Ic5ae7d5ed271cf6dbb2341be8a8fb1f38a858b43
2021-05-14 10:05:24 +00:00
TreeHugger Robot
99553c187e
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: I48ca62c820b0cd49b89a07a32c474007964a4671
2021-05-14 10:05:02 +00:00
TreeHugger Robot
0b246618f0
Merge "Fix test case failed" into sc-dev am: 6cd4ad46d2 am: 7dada139f5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542669
Change-Id: Id3e428722c57c5cc26a01b768c3165c1126c65ac
2021-05-14 10:04:39 +00:00
Chiachang Wang
27130d5ce9
Merge "Replace clearAll with withoutDefaultCapabilities" into sc-dev am: 5613be1465 am: e5d4adc69e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14518468
Change-Id: I1ec067ca7807a25adcb03287cafe1b4b4210b23a
2021-05-14 10:03:41 +00:00
TreeHugger Robot
3fc655482f
Merge "Wrap generating battery history keys into another method" into sc-dev am: 5c2a472b39 am: 9fce90e953
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14542665
Change-Id: I9ede2d99ee515f1293af067496fc1695824b50ed
2021-05-14 10:03:28 +00:00
Stanley Wang
5d6410dbd6
Merge "Guard the NPE on StartNow slice" into sc-dev am: f7cb316cd2 am: 96431d2f81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515932
Change-Id: I57253a85e254a07856ebe4d799cc09a6259c1f49
2021-05-14 10:03:22 +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
7dada139f5
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: I8e73e48e79036bb16405fab8d7199bb86bcdb4a5
2021-05-14 09:38:42 +00:00
Chiachang Wang
e5d4adc69e
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: Ic7941313cb8d84a85cb7442b0d2964b6092b620c
2021-05-14 09:38:13 +00:00
TreeHugger Robot
9fce90e953
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: Iefde1d1d782fcd046ebf19f650f317a53113750b
2021-05-14 09:37:50 +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
96431d2f81
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: I73d55bc733ea2176c7416fa986f8da78eb264f5b
2021-05-14 08:17:01 +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
094cfbd9af
Merge "Add divider below ActionButtonPreference in BluetoothDetailFragment" into sc-dev am: f6712e330a am: 5c3a065926
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14439452
Change-Id: Icbe7ae87dea82d64340f9c92bd6358f87952ab0c
2021-05-14 06:41:27 +00:00
TreeHugger Robot
5c3a065926
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: I5ecd7915b007d3103518ef4348efd3659228cc98
2021-05-14 06:27:27 +00:00