TreeHugger Robot
6225c4a3af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092782
Change-Id: I573848bc5bd6cfd18ae7e73fe2b2679dc155261a
2021-06-24 20:42:25 +00:00
TreeHugger Robot
54c1ff8489
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-24 20:25:56 +00:00
TreeHugger Robot
510d842992
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7
-s ours am: b8bd54cd94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092772
Change-Id: I48915126bede1c00e53af1f9f85414a9fb7f6034
2021-06-24 20:15:26 +00:00
Bill Yi
6ace7cdcb2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f
-s ours am: 3e45d30cfb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092774
Change-Id: Iebc27f5c780f1483cc216fde9ec712a2bd4f1066
2021-06-24 20:15:22 +00:00
TreeHugger Robot
cb3096af34
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0
-s ours am: 0e1287502f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092777
Change-Id: Ic835ded7c7cf0409344720eb663153b6a6df1b6c
2021-06-24 20:15:18 +00:00
Bill Yi
3716c2a75f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851
-s ours am: 06ffb62957
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092776
Change-Id: Iecb99258b8a0a0acbefbabb11d17b8a8b4d1cf16
2021-06-24 20:15:14 +00:00
TreeHugger Robot
2ac3bc7a2a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092779
Change-Id: I1fcb35daec8ac19969b6181411407ae1b391ff95
2021-06-24 20:15:05 +00:00
TreeHugger Robot
b8bd54cd94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092772
Change-Id: I157969d7a1a3f3b5cab29f3e9ecec9e3c89dba92
2021-06-24 20:14:39 +00:00
Bill Yi
3e45d30cfb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092774
Change-Id: Ie9e55bbaf2f5d03312deca10c09c21658eb7fb2d
2021-06-24 20:14:30 +00:00
TreeHugger Robot
0e1287502f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092777
Change-Id: Iaea10d18ec08b69975f0f172e3b1fc282f8db64a
2021-06-24 20:14:05 +00:00
Bill Yi
06ffb62957
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092776
Change-Id: Ic10837a5f31ad798d1b9d43cadf6eb52300e4975
2021-06-24 20:14:00 +00:00
TreeHugger Robot
483f978ba7
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-06-24 20:02:41 +00:00
TreeHugger Robot
fa6b455bd0
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-06-24 19:58:49 +00:00
TreeHugger Robot
edeef947e4
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-24 19:56:59 +00:00
TreeHugger Robot
ca62b8d0aa
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-24 19:51:09 +00:00
TreeHugger Robot
f0708e90f6
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-06-24 19:48:40 +00:00
TreeHugger Robot
15e4ca6442
Merge "Updated fingerprint bad calibration string" into sc-dev am: dda37a3500
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15083859
Change-Id: Ica9979965368a4aa9c42931441729290b6bd174b
2021-06-24 18:32:57 +00:00
TreeHugger Robot
dda37a3500
Merge "Updated fingerprint bad calibration string" into sc-dev
2021-06-24 18:12:11 +00:00
Curtis Belmonte
911fc6569b
Merge "Use correct string for Face Unlock preference category" into sc-dev am: 4de89a9361
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085245
Change-Id: I8dbc2baf032d6d4dc7af46a80775d33fb7572928
2021-06-24 17:59:01 +00:00
Curtis Belmonte
4de89a9361
Merge "Use correct string for Face Unlock preference category" into sc-dev
2021-06-24 17:47:14 +00:00
Bill Yi
ae7989d729
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic0b8647c8319e2389b3e8bf0bf90edcfc9935d25
2021-06-24 15:51:28 +00:00
Bill Yi
e93a98e06b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I95f8f317ddf4f40de75a9d7171960ca430dc0cd9
2021-06-24 15:47:17 +00:00
Bill Yi
d1c25e8dfe
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I62eace4a91508f8f27ab37d4cb9a464ba6417f4c
2021-06-24 15:39:29 +00:00
Bill Yi
a83bc881f6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib99ff0cca771e011eb4c7c01e741b47a6ff57724
2021-06-24 15:37:57 +00:00
Bill Yi
1ff9267e5a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idda50c4476939eb34180e330eb2d8ffc1ceebafe
2021-06-24 15:33:28 +00:00
Bill Yi
342b2ae851
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic8d9a3522550591b80fc7cd8470d939c324443ef
2021-06-24 15:29:50 +00:00
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
Bill Yi
8198514a9f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I94d39b7145cec9ac42f49e6debb051cfe5fa59c6
2021-06-24 15:20:40 +00:00
Bill Yi
a6df60ab6b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifff56e70e67db8993c9fd789cdb86c471172329e
2021-06-24 15:15:22 +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