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
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
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
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
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
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
TreeHugger Robot
f6712e330a
Merge "Add divider below ActionButtonPreference in BluetoothDetailFragment" into sc-dev
2021-05-14 06:12:41 +00:00
Treehugger Robot
3a5720b95f
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: I452d4d4f177eeb6042dc419e36699995fc36c7dc
2021-05-14 05:25:48 +00:00
Treehugger Robot
d70199e634
Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d am: a2dc65e71e am: 68b3473610
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889
Change-Id: I68a79558c465c96ea9b805f87acce0d406991b8d
2021-05-14 05:10:44 +00:00
Treehugger Robot
68b3473610
Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d am: a2dc65e71e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889
Change-Id: I62a812859d2eec5a9c92c40f9fd4bdf800743f80
2021-05-14 04:54:03 +00:00
Treehugger Robot
a2dc65e71e
Merge "Device picker: add title to fix offset in progressbar" am: a3da419c8d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1622889
Change-Id: I966b9ede97c0d3e997b96dc012ffdd6476688448
2021-05-14 04:38:14 +00:00
TreeHugger Robot
5390257b90
Merge "Account settings: Fix duplicate title and extra padding." into sc-dev am: 52f627f9ef
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14488985
Change-Id: I3fcd962a89216a7abf98304d937d2e733984c608
2021-05-14 04:34:12 +00:00
TreeHugger Robot
b151225fae
Merge "Fixed extra padding in "Open by default" page" into sc-dev am: 8b9f1d4f9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540523
Change-Id: I35924e1cf72d4923ebd5916ea09f2d133befe1fc
2021-05-14 04:33:52 +00:00
TreeHugger Robot
fee3049603
Merge "Fix work profile picker user icon didn't follow UX guideline" into sc-dev am: c3dfd37df6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14540524
Change-Id: Ida7d57f7c51933cab11b94a6ce730dfcc8253751
2021-05-14 04:33:33 +00:00
TreeHugger Robot
52f627f9ef
Merge "Account settings: Fix duplicate title and extra padding." into sc-dev
2021-05-14 04:14:24 +00:00
Treehugger Robot
a3da419c8d
Merge "Device picker: add title to fix offset in progressbar"
2021-05-14 04:12:44 +00:00
TreeHugger Robot
8b9f1d4f9e
Merge "Fixed extra padding in "Open by default" page" into sc-dev
2021-05-14 03:57:18 +00:00
TreeHugger Robot
c3dfd37df6
Merge "Fix work profile picker user icon didn't follow UX guideline" into sc-dev
2021-05-14 03:39:38 +00:00
Ahaan Ugale
6663bed71c
Account settings: Fix duplicate title and extra padding.
...
This change reverts the change in
I3981ce73fef63f06a40e61e894481d24284614ba to add a PreferenceCategory
for the accounts after merging the page with autofill settings. That was
done to get the Accounts heading to display for the personal/work
profile view.
This change instead sets the title on the existing PreferenceCategory
that's created dynamically in the Controller.
Removing the extra PreferenceCategory also fixes the padding.
Fix: 183677515
Bug: 183677706
Test: manual - with single profile, with personal/work profiles
Test: make -j RunSettingsRoboTests \
ROBOTEST_FILTER="com.android.settings.accounts.AccountPreferenceControllerTest"
Change-Id: Ib7fe6f97b93b81d5a5897280cdd6bbad1b75f3a9
2021-05-13 19:49:04 -07:00
TreeHugger Robot
22f1137335
Merge "Remove the divider above footer in Gesture Navigation Settings" into sc-dev am: e01099b245
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515939
Change-Id: I4ef7edc08b59977b15dc5809af6483bd2b9f6c34
2021-05-14 02:47:52 +00:00
TreeHugger Robot
e01099b245
Merge "Remove the divider above footer in Gesture Navigation Settings" into sc-dev
2021-05-14 02:42:43 +00:00
Yanting Yang
1e14321bfe
Merge "Move DWB to the fifth position from the bottom on the homepage" into sc-dev am: 542ba7477e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14519526
Change-Id: I59a058623f28e1b746482f1d948401b49b114570
2021-05-14 02:41:50 +00:00
YUKAI HUNG
185c38f26c
Merge "Make chart time slot not clickable when accessibility servie is enabled" into sc-dev am: f70cb82b0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14515927
Change-Id: I32264a231a43c0bdff7d2d8e8ce94e97efe588d3
2021-05-14 02:41:23 +00:00
Tiffany Nguyen
77728801c2
Merge "Redirect battery-level settings preference clicks if needed" into sc-dev am: df8537269f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14486116
Change-Id: Ib1ea395ab0df19f122828c475de3daead844f22e
2021-05-14 02:41:18 +00:00
Yanting Yang
542ba7477e
Merge "Move DWB to the fifth position from the bottom on the homepage" into sc-dev
2021-05-14 02:37:12 +00:00
Edgar Wang
c6e0507f38
Fix work profile picker user icon didn't follow UX guideline
...
- Remove duplicated dimen in Settings
Fixes: 186609520
Test: manual & robotest
Change-Id: I256e4f75fe131449b2593d1a8cb422f122a943ac
2021-05-14 10:35:24 +08:00