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
9beb22936e
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: I9aa3dc5a899d3862f7ca7df86bbfc0a3b9f1ecef
2021-06-24 13:11:56 +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
7b4441407b
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: ab3018bd2c
am: 7fb2a3e852
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: I5601db641ab428421779dfa42a71fa4626206ba8
2021-06-24 10:03:53 +00:00
Prochin Wang
80b96ad40e
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: 595709c5a7
am: 4022d5e021
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: Id572136d69dc4308e159f7b5bc03f0a7ba9231c4
2021-06-24 10:03:25 +00:00
Prochin Wang
7fb2a3e852
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: ab3018bd2c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: I576e4f4b07af208ebb32b612483bb6a6d7cd4c58
2021-06-24 09:51:32 +00:00
Prochin Wang
4022d5e021
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: 595709c5a7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15079270
Change-Id: I104ca3b29cfbfd64f0b66e77366b5686b518e407
2021-06-24 09:51:12 +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
ddc2ffbe9c
Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d
am: bdef27388c
am: b5128f819e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925
Change-Id: I65824110145ab2dc975ed1afb4521c61d2705ef4
2021-06-24 09:39:42 +00:00
TreeHugger Robot
85645cd4d8
Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d
am: 1751e1ea22
am: bd80f7eac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925
Change-Id: Iab0d0529514681667349a7dd9cff0c218c29fa49
2021-06-24 09:39:34 +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
9f5abd16de
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: I033dc319ec7f1142fd9608cceb86cd2589960532
2021-06-24 09:35:02 +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
TreeHugger Robot
b5128f819e
Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d
am: bdef27388c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925
Change-Id: I5ee4a03760a9405edeaaeaed1164033af090972c
2021-06-24 09:27:32 +00:00
TreeHugger Robot
bd80f7eac8
Merge "Revert "Fix 'No Apps' UI issues of ManageApplications"" into sc-dev am: 37b1831d0d
am: 1751e1ea22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083925
Change-Id: I44f17ff97584173e0d21b6cc6353f77fdc446d2a
2021-06-24 09:27:13 +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
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
68bc21c508
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: I44e8114f3ef5f1b2abf3f51b809773189e53ab2e
2021-06-24 09:09:39 +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
tim peng
2cc4e601a3
Merge "Sound panel doesn't match material next design for Android S" into sc-dev am: 416a24d821
am: 2b03503015
am: dc8199b6cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076794
Change-Id: Ibd48456b90a63acc3b3a0c9ad7375df89d52500b
2021-06-24 07:57:11 +00:00
tim peng
f3ed92b479
Merge "Sound panel doesn't match material next design for Android S" into sc-dev am: 416a24d821
am: 13e9349f1d
am: 02a51f3d46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076794
Change-Id: I85194d21715b31e8f3a84a94dd30c0dd823a0c6d
2021-06-24 07:57:03 +00:00
tim peng
dc8199b6cf
Merge "Sound panel doesn't match material next design for Android S" into sc-dev am: 416a24d821
am: 2b03503015
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076794
Change-Id: I6c49890968d317b3284011b94fec09d190211af5
2021-06-24 07:36:30 +00:00
tim peng
02a51f3d46
Merge "Sound panel doesn't match material next design for Android S" into sc-dev am: 416a24d821
am: 13e9349f1d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076794
Change-Id: I6c2adc883f9b0be2e77776dd9a491afa5cfffe06
2021-06-24 07:36:12 +00:00
tim peng
c000f49a76
Merge "Sound panel doesn't match material next design for Android S" into sc-dev am: 416a24d821
am: 5bafb29a4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076794
Change-Id: I930d976dd3fc6fdcc90dfa4f18c87db6ab1f36d0
2021-06-24 07:35:42 +00: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
5bafb29a4f
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: I77cf7af05eb834ca6894de5f9fb5d29f236d3659
2021-06-24 07:18:49 +00:00
tim peng
2b03503015
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: I98ce4b1f09e0a91c2ab726a5c2fec426326d5f63
2021-06-24 07:18:20 +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
70a8aa1499
Merge "Tweak UI of profile tab layout" into sc-dev am: 73f539ed3f
am: ccee1e82ee
am: c6b97a939e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080730
Change-Id: I9e7c2070e8fe333ec1382a6c366f4fd1289ac83c
2021-06-24 06:40:19 +00:00
Arc Wang
099d0a6169
Merge "Tweak UI of profile tab layout" into sc-dev am: 73f539ed3f
am: 8dad166f0c
am: 2531c74c88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080730
Change-Id: Id06284871e186e01820ec0c2723d707137a7664a
2021-06-24 06:40:13 +00:00
Arc Wang
c6b97a939e
Merge "Tweak UI of profile tab layout" into sc-dev am: 73f539ed3f
am: ccee1e82ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080730
Change-Id: I807e703cc24228ab6076accbbf5c125cca9e17ad
2021-06-24 06:32:07 +00:00
Arc Wang
2531c74c88
Merge "Tweak UI of profile tab layout" into sc-dev am: 73f539ed3f
am: 8dad166f0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080730
Change-Id: Idb385550694649937f3c432f24c1585aff00160b
2021-06-24 06:31:52 +00:00
Arc Wang
c0b7f4e903
Merge "Tweak UI of profile tab layout" into sc-dev am: 73f539ed3f
am: ec8084fe73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15080730
Change-Id: I2d620b08772492b8e257bbc5a4c364711969f614
2021-06-24 06:31:18 +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
ec8084fe73
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: I01eee893314cbe751185ae7f6cb48239c1708038
2021-06-24 06:13:15 +00:00
Arc Wang
ccee1e82ee
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: I5ba63ade5a81d6c490da14f1b95d9deacf5b4e4c
2021-06-24 06:13:14 +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
674c28dac9
Merge "Fix crashes when clearing storage for a protected package" into sc-dev am: 79ee0ea944
am: 732b2b0bc6
am: e366490c4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081391
Change-Id: I902cd0a5f06011624fa0703423695bf0d842c412
2021-06-24 04:13:12 +00:00
Arc Wang
70beca6e21
Merge "Fix crashes when clearing storage for a protected package" into sc-dev am: 79ee0ea944
am: 0a873a62cf
am: 7e94a559c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081391
Change-Id: I86ac95c186af16a9c5cb1517eb9ff14a47b6635e
2021-06-24 04:13:04 +00:00
Arc Wang
e366490c4e
Merge "Fix crashes when clearing storage for a protected package" into sc-dev am: 79ee0ea944
am: 732b2b0bc6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081391
Change-Id: Iaf7debb52265e584b5474586563911122901e6e6
2021-06-24 04:00:56 +00:00
Arc Wang
7e94a559c1
Merge "Fix crashes when clearing storage for a protected package" into sc-dev am: 79ee0ea944
am: 0a873a62cf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15081391
Change-Id: I2d474eb085d941f04cd7024479c25b48f4d75b19
2021-06-24 04:00:40 +00: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
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