Quang Luong
f151a04d43
Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404
Change-Id: Ibe201c94dadde5ac0498246a3d48d501a720e0b4
2021-06-24 15:27:38 +00:00
Quang Luong
afc0bd763c
Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev
2021-06-24 15:12:38 +00:00
Jeff Sharkey
cf5988db8a
Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071
Change-Id: Ia670fbf2a906638019087cddda098d8c5a40e33b
2021-06-24 15:02:11 +00:00
Jeff Sharkey
5b7518fdf7
Merge "Update to modern Bluetooth permissions." into sc-dev
2021-06-24 14:44:28 +00:00
Wesley Wang
faa0004d16
Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550
Change-Id: Ifb2252f56faaa9f04a6fef2095fed8021272e115
2021-06-24 13:57:54 +00:00
Wesley Wang
31428e9dc5
Merge "Remove unnecessary converting us to ms" into sc-dev
2021-06-24 13:45:16 +00:00
TreeHugger Robot
3f2fd2e060
Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023
Change-Id: I82708d22cde27cca3d54dfc2a9abf598c5e8ba08
2021-06-24 13:38:43 +00:00
TreeHugger Robot
e7b17ece47
Merge "Fix a flicker problem on top app bar" into sc-dev
2021-06-24 13:32:55 +00:00
Alex Johnston
f4bfda65a5
Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789
Change-Id: Ib94bf919bc168523688bad893b8dbc63826f0fe1
2021-06-24 13:12:33 +00:00
Alex Johnston
901617e37d
Merge "Update CA certificate warning to material next spec" into sc-dev
2021-06-24 12:59:14 +00:00
Wesley.CW Wang
273a7d96a3
Remove unnecessary converting us to ms
...
- Pick from pagit/1951738
- The class "Estimate" has the menber estimateMillis and the unit of batteryUsageStats.getBatteryTimeRemainingMs() is millisecond, so converting from us to ms is unnecessary.
Bug: 187379252
Bug: 184916537
Test: make RunSettingsRoboTests
Change-Id: I2e8e03451352d7ad4cd44f72d5261dad35a81eb9
2021-06-24 11:41:53 +00:00
Prochin Wang
595709c5a7
Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev am: 1ff0fe1d5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: Ic47d91f747888dfb5a54f8ce773fd5fc5c8f93b2
2021-06-24 09:35:51 +00:00
Prochin Wang
1ff0fe1d5a
Merge "To hide the soft input window when press skip button on Skip setup for PIN and face dialog of Set a PIN screen to avoid flash during transition." into sc-dev
2021-06-24 09:24:02 +00:00
TreeHugger Robot
1751e1ea22
Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925
Change-Id: I96e6c0792e25b4cbf286fcb022cbfe2bb76f68d0
2021-06-24 09:10:21 +00:00
TreeHugger Robot
37b1831d0d
Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev
2021-06-24 08:57:58 +00:00
prochinwang
b6b2485796
To hide the soft input window when press skip button on Skip setup for
...
PIN and face dialog of Set a PIN screen to avoid flash during transition.
bug:191181054
Test: SUW
Test: make -j RunSettingsRoboTests
Change-Id: I229b190de5e6dc714bbb8408e91c363e90b18f30
2021-06-24 08:52:25 +00:00
Arc Wang
0358562a9b
Revert "Fix 'No Apps' UI issues of ManageApplications"
...
This reverts commit 4a97095e36 .
Reason for revert: <It has abnormal scroll behavior when there is no profile tab>
Bug: 191945032
Bug: 191944934
Change-Id: Id6c71fbec4f490034bc07f6d8c9efabcb877d110
2021-06-24 08:25:44 +00:00
Mill Chen
fb2bfac434
Fix a flicker problem on top app bar
...
The height of top app bar area is dependent on the line count of
multiline title. This mechanism is always triggered when entering either
subsetting page or rotating the screen, regardless the state of
collapsing toolbar. That is saying this mechanism caused a flicker
problem or a title in wrong color. The mechanism will be updated to
check the state of collapsing toolbar to make sure that it is only
triggered if the collapsing toolbar is in expanded state.
Fix: 186419089
Fix: 187709056
Test: visual verified
1) Navigate to a subsetting page with multiline title
2) Rotate the screen to landscape mode and collapse the title
3) Rotate the screen to portrait mode and see if the title is in
collapsed state
Change-Id: I3da2403fa43913469e64bd37e761b41a083efd38
2021-06-24 16:04:36 +08:00
tim peng
13e9349f1d
Merge "Sound panel doesn't match material next design for Android S" into sc-dev am: 416a24d821
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076794
Change-Id: I39a9145ef21d85b366f80897170838cf73dfd919
2021-06-24 07:19:30 +00:00
tim peng
416a24d821
Merge "Sound panel doesn't match material next design for Android S" into sc-dev
2021-06-24 07:04:37 +00:00
Arc Wang
8dad166f0c
Merge "Tweak UI of profile tab layout" into sc-dev am: 73f539ed3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080730
Change-Id: I39d3f4520d98d75a643edaacb53b56f8706e352c
2021-06-24 06:14:00 +00:00
Arc Wang
73f539ed3f
Merge "Tweak UI of profile tab layout" into sc-dev
2021-06-24 05:58:10 +00:00
Arc Wang
0a873a62cf
Merge "Fix crashes when clearing storage for a protected package" into sc-dev am: 79ee0ea944
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081391
Change-Id: Ib6dafcc9486ccf794d6c527e223d49f309711192
2021-06-24 03:35:48 +00:00
Arc Wang
79ee0ea944
Merge "Fix crashes when clearing storage for a protected package" into sc-dev
2021-06-24 03:21:49 +00:00
Arc Wang
4f1d2ebfdf
Tweak UI of profile tab layout
...
- Change color & shape of indicator.
- Add margin around tab layout.
- Remove divider below the tab layout.
Bug: 188589806
Bug: 188589053
Test: manual visual
Change-Id: I644a4aeb951daa6eb601229fa5f1096dcbdc86ca
2021-06-24 11:15:48 +08:00
Arc Wang
e461e673ac
Fix crashes when clearing storage for a protected package
...
When clearing storage for a protected package,
ActivityManager throws a SecurityException.
This change catches the exception then shows a dialog
with the message "Couldn't clear storage for app".
Bug: 191806850
Test: manual visual
1. Lock the device.
2. Clear storage for a protected package.
Change-Id: Ic3e2c2237c6ee6dc945b03dac35b3b96a26129a9
2021-06-24 01:31:19 +00:00
Curtis Belmonte
a8d6dba649
Merge "Fix face education UX for both grid and traffic light" into sc-dev am: 147fa2f159
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15084564
Change-Id: I5f7ef4965a008e4d70fac9338b3a6b65e445fca9
2021-06-24 01:13:30 +00:00
Curtis Belmonte
147fa2f159
Merge "Fix face education UX for both grid and traffic light" into sc-dev
2021-06-24 00:57:31 +00:00
Jeremy Goldman
1d2831122a
Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev am: 7a6ff6942c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007770
Change-Id: I985d3a55d15a0fb53f6d62b06644f2e30f7c754e
2021-06-24 00:42:41 +00:00
Jeremy Goldman
7a6ff6942c
Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev
2021-06-24 00:40:46 +00:00
TreeHugger Robot
4801c804ba
Merge "Change your to the for lock prompts." into sc-dev am: c8059dc338
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081922
Change-Id: Ib99a9d3e55f527e3fc4adcc95d426112d8477507
2021-06-24 00:38:15 +00:00
TreeHugger Robot
c8059dc338
Merge "Change your to the for lock prompts." into sc-dev
2021-06-24 00:24:26 +00:00
Menghan Li
c4f8d2e5bf
Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863
Change-Id: Ie8b6955ce1ea129b6940ff40b971ffe989aff6b0
2021-06-23 23:59:55 +00:00
Menghan Li
b2d7b6e5de
Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev
2021-06-23 23:49:40 +00:00
Joe Bolinger
f144de8909
Change your to the for lock prompts.
...
Bug: 188847063
Test: N/A
Change-Id: I2c3432cc1ef12d4dc265f71a465a7ebb6df4c666
2021-06-23 16:19:00 -07:00
Curtis Belmonte
d3a07c29bf
Fix face education UX for both grid and traffic light
...
Makes the following adjustments to the UI of the Face Unlock education
screen for both the grid and traffic light enrollment flows:
- Fixes issues with text being overlapped by illustrations
- Prevents views from moving vertically due to state changes
- Ensures no scroll is required for default locale and scaling
- Adjusts the color and content of the a11y setup toggle
Test: Manual:
1. Start grid-based face enrollment (e.g. from Settings > Security)
2. Proceed to "How to set up Face Unlock" screen
3. Tap "Setup for limited vision or head motion"
4. Toggle "Setup for limited vision or head motion" switch off and on
5. Repeat steps 1-4 for traffic light face enrollment
Fixes: 191105436
Fixes: 191317385
Change-Id: Ie80f5b3130b5b0aeceb889f53cc2dec8c7423e47
2021-06-23 16:14:40 -07:00
Quang Luong
e619d227c9
isCarrierNetworkActive() should check if the carrier network is default
...
WifiPickerTrackerHelper should use MergedCarrierEntry.isDefaultNetwork()
for isCarrierNetworkActive().
Bug: 191090765
Test: atest WifiPickerTrackerHelperTest
Change-Id: I44d8eed3af019a8d6a30a4b743cad468d1f0469b
2021-06-23 16:08:47 -07:00
menghanli
880e1898fc
Show one line of footer content change in Accessibility button page when the user is in gesture nav.
...
Bug: 190563948
Bug: 191733125
Test: make RunSettingsRoboTests -j52 ROBOTEST_FILTER=AccessibilityButtonFooterPreferenceControllerTest
Change-Id: I13ce0b3331835469d6eb9a6263a3a01f821814a8
2021-06-24 05:24:14 +08:00
TreeHugger Robot
35e410b52b
Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801
Change-Id: I295986d82ed772e9c86c7eb1df2080874f6fa360
2021-06-23 15:44:59 +00:00
TreeHugger Robot
22f6857a6a
Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev
2021-06-23 15:12:19 +00:00
Jeff Sharkey
7025a83f39
Update to modern Bluetooth permissions.
...
The Settings app offers several Bluetooth intents, and they need to
be updated to enforce the new "Nearby devices" runtime permission
model, since the old BLUETOOTH and BLUETOOTH_ADMIN permissions have
been deprecated.
Bug: 191174082
Test: TH
Change-Id: I0d812f486bc3dadc517d5b04d3082d4f56f60ef4
2021-06-23 08:53:05 -06:00
PETER LIANG
b265fa23e4
Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev am: a458f9cdea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15064551
Change-Id: I7e17d32624aab42fa101f03c2848c88d2aa01d3d
2021-06-23 14:37:58 +00:00
PETER LIANG
a458f9cdea
Merge "Fixing the SettingsRoboTest failure of the AnimatedImagePreference." into sc-dev
2021-06-23 14:22:09 +00:00
Weng Su
9395d39063
[Provider Model] Remove Wi-Fi switch menu in internet panel
...
- Remove "Turn on/off Wi-Fi" menu in internet panel
- Don't show the default "See more" menu in internet panel also.
Bug: 189912933
Test: manual test
atest -c InternetConnectivityPanelTest
Change-Id: I3a9927e356e0f7e534b1e2ba848d2b6d2a5bd858
2021-06-23 12:47:06 +00:00
Jeremy Goldman
5f439a69e3
Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771
Change-Id: I55f965d4d0e22cca68455eb0a71ee1c1f9894d31
2021-06-23 10:31:21 +00:00
Jeremy Goldman
e68805950d
Merge "Null check added when updating the roaming status." into sc-dev
2021-06-23 10:27:32 +00:00
TreeHugger Robot
70af2a91a9
Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792
Change-Id: I35dfc64db55fa76328ea7848185284d59f03614d
2021-06-23 10:27:26 +00:00
TreeHugger Robot
55b7b6b508
Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930
Change-Id: Ife15d5ec66937c5303b24a74164733838ab3a6fa
2021-06-23 10:27:13 +00:00
TreeHugger Robot
3f3034c2db
Merge "Fix the NPE issue" into sc-dev am: 74babf6e91
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869
Change-Id: I154f60cc017cc1ff063459953c8d5171653d69ea
2021-06-23 10:27:02 +00:00
TreeHugger Robot
b86f0c0472
Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev
2021-06-23 10:19:04 +00:00