TreeHugger Robot
76a6621428
[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: Idcd09b7c0a3ab713a23fa91c239e617476f5e67e
2021-06-24 20:14:06 +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
Zim
6699b47f77
Update string to enable transcode via MTP
...
Also added a summary string when checked.
Test: Manual
Bug: 191985287
Change-Id: I1db9763bbf3766eecace6eca168218ab71ca6195
2021-06-24 20:13:08 +01:00
TreeHugger Robot
6916b17c04
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: Id9ccc2ce6ca576f3949b1519019842201a2862de
2021-06-24 18:30:59 +00:00
TreeHugger Robot
dda37a3500
Merge "Updated fingerprint bad calibration string" into sc-dev
2021-06-24 18:12:11 +00:00
Curtis Belmonte
e3c31297b2
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: I915e1b3e6623a30fb3fd9be75bccdb5c13c359a9
2021-06-24 17:58:07 +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
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
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
c017fdda03
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: I6d99ce94d10c99294cfd001fe4454e52314bf14b
2021-06-24 15:26:37 +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
60256a980e
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: I450a317c3a77c920f2a633f2f6f9cbd1e226f044
2021-06-24 15:01:10 +00:00
Jeff Sharkey
5b7518fdf7
Merge "Update to modern Bluetooth permissions." into sc-dev
2021-06-24 14:44:28 +00:00
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
Wendy Sung
666178a0dc
Add Adaptive Preferences Lottie File for Dark Mode
...
Test: make Settings
Bug: 178199757
Change-Id: I22751a4ea3c25a252c641871f1b1249f6ff92bcc
2021-06-24 08:47:20 +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
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
Wesley.CW Wang
fb38259a0d
Update batteryDiffEntry filter condiction
...
- Add condiction CONSUMER_TYPE_UID_BATTERY to avoid query system app data
- Add default value for uid when entering AppInfo page
Bug: 191734051
Test: make SettingsRoboTests
Change-Id: I377e0d6aaa386dd5983eb71be1248f9859728cb9
2021-06-24 14:39:24 +08: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
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
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
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
TreeHugger Robot
d4a3d14b52
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: I3d02075249299c653e5a017b9c1ff73d839be2b6
2021-06-24 00:37:45 +00:00