Wesley Wang
01be9a9316
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: I18095a162e3422305b3cca2c0a5cd15e7ff4b6f1
2021-06-24 13:56:45 +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
025be92f86
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: I28cd085bdee109258f09cb0caf7f43a0d7d6fd2b
2021-06-24 13:37:48 +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
6cbce0e954
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: I9711a05481efbc6b4d03d0247e2e753b9efedecc
2021-06-24 13:11:43 +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
ab3018bd2c
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: I2a290afc3256e5ed9ec440f021110aaacaa03031
2021-06-24 09:34:58 +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
bdef27388c
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: Ib658145239a3d76df3b4461c0852121604f1ccc9
2021-06-24 09:09:13 +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
732b2b0bc6
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: If61ab834c034bbb50d846f3de550140fb2a98dd5
2021-06-24 03:34:56 +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
d50fe51f27
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: Ib8e4dab08664d29ff6c09c6d848e6e92955855cc
2021-06-24 01:12: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
4d2861be0b
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: I6472545a7af7840d6e9562675bff1189d3781cf9
2021-06-24 00:55:06 +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
4fc3f100ae
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: I8f709c24b3ef6799ee770286f64850957ddc48e3
2021-06-23 23:59:03 +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
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
2924989c46
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: I7896e2c43083c812376a6ce45d096ea73c23fec2
2021-06-23 15:43:54 +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
a72deb37bd
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: I6d16a6d94b2ff98d2382f0edf0a6b572fc2c8551
2021-06-23 10:30:19 +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
673ee6ed51
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: I821e5cc867d5d0d997c314ae0ee15f7547038c34
2021-06-23 10:26:46 +00:00
TreeHugger Robot
137e14b6af
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: Iad43cea522add591f04cf9b8d0fc9149a91cdab0
2021-06-23 10:26:23 +00:00
TreeHugger Robot
6f7dc069c3
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: I48a6e673d3aa12c9e23f3fb4d400356cf7ff9cc7
2021-06-23 10:26:03 +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
2cd4a9ebe6
Merge "Suppress the action bar in SetupChooseLockGeneric" into sc-dev am: 94bc9d4c31
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15048199
Change-Id: I27b5d96dda5b3c66e87291196229dec8f6491981
2021-06-23 06:25:00 +00:00
TreeHugger Robot
b1098f023f
Merge "Fix missing share context option in settings app" into sc-dev am: 60b63d549a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14957028
Change-Id: Ic3689b50c773bb34fe97650ad6418b848c05ae37
2021-06-23 06:24:36 +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
708845caca
Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev am: 2de946e584
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15054779
Change-Id: I88fd8f9e99d55f1e036a3d6c23a25b32cb30a1d3
2021-06-22 17:02:13 +00:00
Yi Jiang
2de946e584
Merge "Hides Screen Attention setting when AttentionService isn't installed." into sc-dev
2021-06-22 16:59:20 +00:00
Arc Wang
9c30b55beb
Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev am: b0e55afc95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14847055
Change-Id: Icd0ad261e41ef6ee563e43aff91edd26a7feb93d
2021-06-22 16:44:43 +00:00
Arc Wang
b0e55afc95
Merge "Fix 'No Apps' UI issues of ManageApplications" into sc-dev
2021-06-22 16:25:13 +00:00
TreeHugger Robot
e62bae21db
Merge "Revert transition codes from the base activity" into sc-dev am: 20faa89e15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056866
Change-Id: I31c21a8fc88dde07afd2ffe99c682b18703963c7
2021-06-22 14:22:23 +00:00
TreeHugger Robot
20faa89e15
Merge "Revert transition codes from the base activity" into sc-dev
2021-06-22 14:11:28 +00:00
TreeHugger Robot
4b13bd3517
Merge "Rollback the See More Intent for non-provider model design" into sc-dev am: dbd5c9cc7c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15029681
Change-Id: Ic78285b59ac096ee7a986a1817f915944f19dec0
2021-06-22 12:48:30 +00:00
TreeHugger Robot
dbd5c9cc7c
Merge "Rollback the See More Intent for non-provider model design" into sc-dev
2021-06-22 12:39:05 +00:00