Bill Yi
28cd196a94
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 130e0ec1ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115838
Change-Id: I54ab7d9f2758a59cf18c6e1cdfb8eebb47a387d9
2021-06-26 05:11:20 +00:00
TreeHugger Robot
cadaadb462
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edea8a6799
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116417
Change-Id: I044b2c9e790d1418f1c34ebae5d31b849290b3bd
2021-06-26 05:10:49 +00:00
TreeHugger Robot
b92673984b
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-06-26 05:01:37 +00:00
TreeHugger Robot
edea8a6799
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-26 04:58:47 +00:00
Bill Yi
3d56d7be5c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1be53c98eb342d9fa588e3c953bf34cd9d12ba75
2021-06-26 03:33:56 +00:00
Bill Yi
9f28edb782
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1fcdc5845232e672d3eb3a28aaf1c094886a3f09
2021-06-26 03:23:44 +00:00
Bill Yi
130e0ec1ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9e83b41c6c7836d1189d68db61d17f4261f4f920
2021-06-26 03:19:15 +00:00
Bill Yi
4f307c462f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If1e176b4aecb4b1db470d97eb30501c75f893dfe
2021-06-26 03:15:46 +00:00
Bill Yi
aa649a6fe5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1b011f8ce25dbc3fdb374eddf0b9c13015907427
2021-06-26 03:07:35 +00:00
Bill Yi
ef757416ab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I35a2f4eb8cce153bb6829fefd265c2f9251fca8b
2021-06-26 03:02:32 +00:00
Joshua Mccloskey
0d9161fd98
Merge "Updated fp bad calibration string" into sc-dev am: 477c5d9cde
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15098972
Change-Id: I1fd58cd49bba98b21744b98697ec85ac0e27de4c
2021-06-25 22:40:40 +00:00
Joshua Mccloskey
477c5d9cde
Merge "Updated fp bad calibration string" into sc-dev
2021-06-25 22:37:01 +00:00
Curtis Belmonte
f55508ca36
Update strings for choose lock password/pattern screen am: 4aa1e532db
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: I81bf482c5372078c1a07624a710a4c79f9ec9eb3
2021-06-25 22:02:54 +00:00
Curtis Belmonte
4aa1e532db
Update strings for choose lock password/pattern screen
...
Makes the following changes to the header/description text shown on the
choose lock screen:
- Remove references to "biometrics" in favor of "face or fingerprint"
- Add a default description when setting a PIN/pattern/password
Test: Manual
Bug: 191923052
Change-Id: I788fd03aaeea624fab548d1c055c5c6dee076e2d
2021-06-25 12:59:47 -07:00
Julia Reynolds
dc5649a529
Fix switch behavior with switch access
...
Test: manual with talkback, switch access, and no a11y aid
Fixes: 189074205
Change-Id: I95c1d0e9c2f82122e224399c6261ad2198901e04
2021-06-25 14:33:59 -04:00
Joshua Mccloskey
05689a3432
Updated fp bad calibration string
...
Test: Verified string was present during enrollment error.
Bug: 189133688
Change-Id: Ia9a447c443fa0784c736e171a2e1840fed55034c
2021-06-25 18:32:19 +00:00
Julia Reynolds
d802ef1614
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: I74b2da6ee478465ba6d3c4106fa6b13d1c9751cf
2021-06-25 15:07:27 +00:00
Julia Reynolds
3d22e9775a
Merge "Disable additional pkgs on DND perm page" into sc-dev
2021-06-25 14:56:13 +00:00
Julia Reynolds
4c7981eb0d
Disable additional pkgs on DND perm page
...
Because they will always have access because they hold
the permission to manage notifications.
Test: manual
Fixes: 191973668
Change-Id: I456aec41b401bba6f10d9ea969e2fb8c4300825d
2021-06-25 09:17:41 -04:00
Bonian Chen
ea951aab42
Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""
...
This reverts commit 7b8e05adab
.
Reason for revert: add missing file back to CL
Bug: 191321218
Test: build pass
Change-Id: I9ae819f06b2b6f042c2f39a8ff76c025ba49f631
2021-06-25 08:47:21 +00:00
Bonian Chen
4a6733e456
[Settings] Fix build breakage
...
There's a missing file within ag/15076791.
ag/15102531 is a revert for ag/15076791.
Right now, ag/15106410 is a revert for revert (ag/15102531).
And this is a CL adding the missing file back.
Bug: 191321218
Test: build pass
Merged-In: I7282c7ba9fbb793056c12928843b6eef59eb2213
Change-Id: I15819472b37a3bdba25fe006246baa968680a19f
2021-06-25 16:38:27 +08:00
Zimuzo Ezeozue
d6bb420ffa
Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781
Change-Id: Idd4a78318f86ecf39a1fd7397518705d7aaf7c5d
2021-06-25 08:36:09 +00:00
Zimuzo Ezeozue
17608ff21a
Merge "Update string to enable transcode via MTP" into sc-dev
2021-06-25 08:24:27 +00:00
Wendy Sung
5b40172e5a
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868
Change-Id: I4f1a59ca2ad058f590505ab878906a94a6e99599
2021-06-25 03:30:22 +00:00
Rajeev Kumar
bbe37e2764
Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090
Change-Id: Ia9aa5400789d91d6131c54d0daa85586c07f0228
2021-06-25 03:27:43 +00:00
Wendy Sung
29da5abcb1
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev
2021-06-25 03:22:41 +00:00
Rajeev Kumar
f11fdb3e50
Merge "Make use of config for auto-created guest users" into sc-dev
2021-06-25 03:15:35 +00:00
Bonian Chen
ec4ccdcc5a
Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531
Change-Id: I3887bffb67f908015d62f4eecb3891ed64f0c822
2021-06-25 02:21:32 +00:00
Bonian Chen
f9aa12f4d9
Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev
2021-06-25 02:17:59 +00:00
Bonian Chen
55e18777c2
Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791
Change-Id: I46192c9ae493e0716b6d39eea5516c0652e2be2e
2021-06-25 02:16:35 +00:00
Bonian Chen
7b8e05adab
Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"
...
This reverts commit 2a1344a50e
.
Reason for revert: Missing some files which would lead to build breakage.
Change-Id: I8c63dea9b41598b563cbf5e5ff1c500cc51b7005
2021-06-25 02:10:43 +00:00
Bonian Chen
97886470cb
Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev
2021-06-25 01:59:05 +00:00
Peter Kalauskas
8d37a2bb85
Make use of config for auto-created guest users
...
If frameworks config config_guestUserAutoCreated=true, then Settings
will:
- Create a new guest user any time the current guest user is removed
- Show "Guest" instead of "Add guest"
- Show "Reset guest" instead of "Remove guest"
Bug: 188542158
Test: With config_guestUserAutoCreated=true, delete current guest user
using adb (`adb shell cmd user list -v --all` to find the user
ids, then remove each guest user with `adb shell pm remove-user
<id>`), then as owner, open multi-users settings page. Check that
there is a item for "Guest" instead of "Add guest". Select
"Guest", then confirm there is an item for "Reset guest" (it
should be disabled). Select "Switch to guest", then switch back to
owner. Open the multi-users settings page again. Check that "Reset
guest" is now enabled. Tap "Reset guest", and press confirmation
button, named "Reset". You should be take back to the main
multi-user settings page and still see "Guest". Wait a few
seconds, then use adb to confirm there is a guest user present.
Test: With config_guestUserAutoCreated=true, switch to guest user, open
multi-users settings page, check that there is an option to "Reset
guest". Select "Reset guest", and press confirmation button, named
"Reset". Phone should switch back to last active user, and QS tile
should now show "Guest" instead of "Add guest". Run `adb shell cmd
user list -v --all` to confirm guest has a new user id.
Test: With config_guestUserAutoCreated=false, confirm that "Add guest"
and "Remove guest" features remain unchanged
Change-Id: I7d5b81bd2e5c6b999ae18cd6b1280ae0496db94b
2021-06-24 17:40:12 -07:00
TreeHugger Robot
0d307d31fa
[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: I2c389114e954d04535003cb6fdf43d1591293013
2021-06-24 20:41:03 +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
154bab9830
[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: If88af61c543edb467acd77ad807c58c807d14a82
2021-06-24 20:18:00 +00:00
Bill Yi
a6268f29d4
[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: I9fa08277478fabc70550a90061e1759ebf18ca00
2021-06-24 20:17:52 +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
bdf534d2c7
[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: Ic180a496da127ae4832a6e53591596ceb21d1dcf
2021-06-24 20:14:22 +00:00
Bill Yi
fb3e0ff793
[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: I4328059d85cca375428226fb962bffe3141c06eb
2021-06-24 20:14:17 +00:00
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