Commit Graph

38361 Commits

Author SHA1 Message Date
Quang Luong
e93e8fe2d5 Merge "isCarrierNetworkActive() should check if the carrier network is default" into sc-dev am: afc0bd763c am: 5f5068f6df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081404

Change-Id: I6f654bda50a93deed9dcb4fa6b61f87dd8e296f3
2021-06-24 15:37:17 +00:00
Jeff Sharkey
6a9a1b9e91 Merge "Update to modern Bluetooth permissions." into sc-dev am: 5b7518fdf7 am: 74446ce412
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15073071

Change-Id: I12ebf9bd8a635fb36207979dfc39c05aa34f2e4b
2021-06-24 15:17:59 +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
5b7518fdf7 Merge "Update to modern Bluetooth permissions." into sc-dev 2021-06-24 14:44:28 +00:00
Wesley Wang
e148da5df7 Merge "Remove unnecessary converting us to ms" into sc-dev am: 31428e9dc5 am: 8750191782
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15093550

Change-Id: I724d6157113468efaa1e08590a6de5a779a16563
2021-06-24 14:06:50 +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
a7ef698351 Merge "Fix a flicker problem on top app bar" into sc-dev am: e7b17ece47 am: 3f18f97154
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15067023

Change-Id: I28a9f68c938373fce62687526559a4a7951328a5
2021-06-24 13:38:16 +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
8b903ff285 Merge "Update CA certificate warning to material next spec" into sc-dev am: 901617e37d am: 9beb22936e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15074789

Change-Id: I27b30deb374abee99555de965df59aa390a201f7
2021-06-24 13:24:42 +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
9b19e16e3f 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 am: 9f5abd16de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270

Change-Id: Idf0089efe5dcb17b7ff3cef8f3adf2d2dceb1062
2021-06-24 09:50:41 +00:00
TreeHugger Robot
f4e69cf26c Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d am: 68bc21c508
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925

Change-Id: I08ed40a5f39dfa2ec857560115346ee4f691302c
2021-06-24 09:26:52 +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
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
Arc Wang
48b39859b9 Merge "Fix crashes when clearing storage for a protected package" into sc-dev am: 79ee0ea944 am: 13f8d44983
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081391

Change-Id: I03ca84bba7af4564ca5ede04b846cc9ce05e9d30
2021-06-24 04:00:13 +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
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
b1d0fb889d Merge "Fix face education UX for both grid and traffic light" into sc-dev am: 147fa2f159 am: e94db97bee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15084564

Change-Id: Iae0d2059f88b3fe568a938062ccd9e93ffc93926
2021-06-24 01:27:05 +00:00
Jeremy Goldman
8c59edaa01 Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev am: 7a6ff6942c am: 9bb3fd99d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007770

Change-Id: I2198b0c121a8d79abd25634df439195ef3bd61d9
2021-06-24 01:08:12 +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
7a6ff6942c Merge "Close AirplaneModeEnabler once lifecycle classes are destroyed." into sc-dev 2021-06-24 00:40:46 +00:00
Menghan Li
0cc32023e5 Merge "Show one line of footer content change in Accessibility button page when the user is in gesture nav." into sc-dev am: b2d7b6e5de am: 7417f49ebd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056863

Change-Id: I090f83e8ac98b9494ac8b3236624c3c5284127aa
2021-06-24 00:17:04 +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
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
8f11a6799f Merge "[Provider Model] Remove Wi-Fi switch menu in internet panel" into sc-dev am: 22f6857a6a am: 4cbdf9d17a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076801

Change-Id: I20c21a9f47793f371c23cd76dbe8402e8e5ac4f5
2021-06-23 16:03:44 +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
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
9faf67d489 Merge "Null check added when updating the roaming status." into sc-dev am: e68805950d am: e0cb5e6c51
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15007771

Change-Id: I8e2c5fc303173ede88c46659ed9f7e6769fe62ab
2021-06-23 10:47:49 +00:00
TreeHugger Robot
37fada87a3 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev am: b86f0c0472 am: bffc06f40d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076792

Change-Id: I8d7e2612ce6f82917f0005c62e1e8de6a96550d2
2021-06-23 10:47:44 +00:00
TreeHugger Robot
33b8710479 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev am: d26416ce81 am: c4501805c9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15065930

Change-Id: I0f21062b2df8ea153601bba68338dbf5459b03e8
2021-06-23 10:47:39 +00:00
TreeHugger Robot
1777344309 Merge "Fix the NPE issue" into sc-dev am: 74babf6e91 am: a4b5ecc5f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056869

Change-Id: Ic674efa0599fb80487d1af4bfcd0c8030092365a
2021-06-23 10:47:33 +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
b86f0c0472 Merge "[Provider Model] Add Wi-Fi toggle in internet panel" into sc-dev 2021-06-23 10:19:04 +00:00
TreeHugger Robot
d26416ce81 Merge "[Provider Model] Show carrier network to internet preference" into sc-dev 2021-06-23 10:11:33 +00:00
TreeHugger Robot
74babf6e91 Merge "Fix the NPE issue" into sc-dev 2021-06-23 10:10:22 +00:00
Alex Johnston
e92f5df3be Update CA certificate warning to material next spec
* Fix colour extraction
* Update landscape mode
* Update logo

Screenshots:
* https://screenshot.googleplex.com/5mwbKLJeFVecrpi
* https://screenshot.googleplex.com/9z62Sw26NX5Zfwu

Bug: 191845997
Test: Manual testing with Settings
Change-Id: Id9988dbce9eabc2b69dba4bd20ca7a6729601147
2021-06-23 10:36:17 +01:00
Weng Su
362bf07919 [Provider Model] Add Wi-Fi toggle in internet panel
- Add a new slice row for Wi-Fi toggle in the network lists

- Increase the maximum number of network lists to 6

Bug: 189912933
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Ie25e108573f264ab3a94fc6804b9d46d855eeea1
2021-06-23 17:19:34 +08:00
Weng Su
627efc46a2 [Provider Model] Show carrier network to internet preference
- If the connected network is the merged carrier Wi-Fi, then show
carrier network to internet prefernce.

Bug: 191091045
Test: manual test
atest -c InternetUpdaterTest

Change-Id: Iad3869f086ea0a4d0607691c6709ee12567831c7
2021-06-23 15:55:24 +08:00
TreeHugger Robot
74a3f9c7da Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev am: 94bc9d4c31 am: 2686aa70c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048199

Change-Id: I6fd336f2c276cd17542dad23648cda539fe99d59
2021-06-23 06:34:58 +00:00
TreeHugger Robot
93393e0267 Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a am: f791f3b988
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028

Change-Id: I445b0816cb297e894c8504c735932b9f5ed88b17
2021-06-23 06:34:49 +00:00
TreeHugger Robot
94bc9d4c31 Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev 2021-06-23 04:24:29 +00:00
TreeHugger Robot
60b63d549a Merge "Fix missing share context option in settings app" into sc-dev 2021-06-23 03:47:39 +00:00
Yi Jiang
d27a09ed94 Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584 am: 966beb8255
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779

Change-Id: I93c73f81aa0bfe736078571b08a57d5f14a42e56
2021-06-22 17:06:22 +00:00
Arc Wang
a40924f815 Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95 am: a3ca0a08d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055

Change-Id: I5a053d3500b6789a995ed004ce3896ebc80f0fa1
2021-06-22 17:01:47 +00:00