Curtis Belmonte
ef3c4de35b
Update strings for choose lock password/pattern screen am: 4aa1e532db
am: f55508ca36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15085893
Change-Id: I4d778ffca11beaea5ef20598e5d0ef1fd2a07d0e
2021-06-25 22:37:19 +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
c22803d428
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
am: ebefd615d8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: Ib4e408b4cccaf8e7064f92ed4ad99ae4c239c5a5
2021-06-25 16:57:43 +00:00
Zimuzo Ezeozue
1f9b116211
Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
am: 73c1c1017c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781
Change-Id: I0b3893415b12c71f41e7c6b4d04905de46c8e808
2021-06-25 16:57:39 +00:00
Wendy Sung
664e1e676b
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
am: 1d909e6649
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868
Change-Id: I3729981cd4282cf60a55122e45d708a9d7d59acc
2021-06-25 16:57:32 +00:00
Rajeev Kumar
4e7b43a73e
Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
am: 2381645bda
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090
Change-Id: I5b64bcbcca1ce9c85a554e1f0c578f920a7ab3ce
2021-06-25 16:39:19 +00:00
Julia Reynolds
ebefd615d8
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: I910d0976c26d0e1df0760e75b8c3117d36afd892
2021-06-25 16:29:45 +00:00
Zimuzo Ezeozue
73c1c1017c
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: Ief22b91b41b4ae0d44bc8ec20560800132bdd712
2021-06-25 16:29:18 +00:00
Wendy Sung
1d909e6649
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: I4bd718dfdc506824e5e9ff96e5218cf433408804
2021-06-25 16:28:22 +00:00
Rajeev Kumar
2381645bda
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: I13f62a014f6f300a8d5aa9b69d47760cff3896de
2021-06-25 16:25:33 +00:00
Julia Reynolds
94542a34b8
Merge "Disable additional pkgs on DND perm page" into sc-dev am: 3d22e9775a
am: d802ef1614
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15109118
Change-Id: Ib285f72bf98de1308b5fc8aa9cebbac42011e467
2021-06-25 16:24:14 +00:00
Zimuzo Ezeozue
069f836135
Merge "Update string to enable transcode via MTP" into sc-dev am: 17608ff21a
am: d6bb420ffa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095781
Change-Id: Ic0894449254aaf0e2488c7f92b224208f5095496
2021-06-25 16:23:51 +00:00
Wendy Sung
a3404607fc
Merge "Add Adaptive Preferences Lottie File for Dark Mode" into sc-dev am: 29da5abcb1
am: 5b40172e5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15056868
Change-Id: Ice4e40cdeba942a35761fd444d4719f6f3d64138
2021-06-25 16:23:10 +00:00
Rajeev Kumar
f3f3db186f
Merge "Make use of config for auto-created guest users" into sc-dev am: f11fdb3e50
am: bbe37e2764
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14988090
Change-Id: Ia011f75e7b19175da595dd59518739a5c31db1b5
2021-06-25 16:17:36 +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
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
98957e6d49
Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9
am: ec4ccdcc5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531
Change-Id: I29a959946e7981617465cb1bd5a964d01dc27869
2021-06-25 02:29:30 +00:00
Bonian Chen
d4f8302d9c
Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev am: f9aa12f4d9
am: d2e5971ed1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15102531
Change-Id: I3fb7018e458943a14ad8494cca1c81814d7fff15
2021-06-25 02:28:51 +00:00
Bonian Chen
2c29f25fbf
Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb
am: 55e18777c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791
Change-Id: I7b576a70724d448f33eb13b08bdcfb4ee17ef927
2021-06-25 02:28:35 +00:00
Bonian Chen
43402ead79
Merge "[Settings] Code Refactor - ActiveSubsciptionsListener" into sc-dev am: 97886470cb
am: 0363e192c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15076791
Change-Id: I11b97060982cd68afd566479265dca5d9f1d6aed
2021-06-25 02:28:25 +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
d2e5971ed1
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: Id38b8ee7895c18dd8211f7b4caf0d307c924f1d0
2021-06-25 02:18:37 +00:00
Bonian Chen
0363e192c1
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: I238d3465742a9998da4553b644299c655b997710
2021-06-25 02:18:12 +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
9422f32573
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489
-s ours am: 0d307d31fa
-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: I2e87438d8d88e8cacc7583a7a82590d96d65f499
2021-06-24 20:52:29 +00:00
TreeHugger Robot
15118dbc4a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489
-s ours am: 6225c4a3af
-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: Ia57333d8312b885835960bdc01e8a58a153f9af0
2021-06-24 20:52:08 +00:00
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
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
48386d90db
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7
-s ours am: b8bd54cd94
-s ours am: 510d842992
-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: I7a1d18fb20f856c2aedb7e2292d187e6d35c8e6b
2021-06-24 20:32:33 +00:00
Bill Yi
5026a41048
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f
-s ours am: 3e45d30cfb
-s ours am: 6ace7cdcb2
-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: I6ccb4fa2b14ccd342217a2ebcedb052641d0e815
2021-06-24 20:32:29 +00:00
TreeHugger Robot
9f8f4b76ef
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0
-s ours am: 0e1287502f
-s ours am: cb3096af34
-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: I91135b124c0e8cb72fa7406b370de63622c0aed0
2021-06-24 20:32:26 +00:00
Bill Yi
2aba6cdc90
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851
-s ours am: 06ffb62957
-s ours am: 3716c2a75f
-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: I91e342c6316a2c2bc43197da5e24530fbe88d33b
2021-06-24 20:32:22 +00:00
TreeHugger Robot
3cf6d9a4e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4
-s ours am: 2ac3bc7a2a
-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: I7130c76c95850caf538d91acb67a71caec346d88
2021-06-24 20:32:14 +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
72365e1ed7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7
-s ours am: b8bd54cd94
-s ours am: 154bab9830
-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: I6f0aed09f99277302dbe31319854743900f1b61c
2021-06-24 20:25:13 +00:00
Bill Yi
2ba9db792e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f
-s ours am: 3e45d30cfb
-s ours am: a6268f29d4
-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: I9b46f6dab2b52db099c9dad674264b933e78f34b
2021-06-24 20:25:09 +00:00
TreeHugger Robot
2972123126
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: fa6b455bd0
-s ours am: 0e1287502f
-s ours am: bdf534d2c7
-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: I9ea0a3b0d2a73c18152e775fb5025e37ddf52e80
2021-06-24 20:25:00 +00:00
Bill Yi
6e950044c0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851
-s ours am: 06ffb62957
-s ours am: fb3e0ff793
-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: Ieecc207cc00de40fefa1f8d4fc8d8701f93c3db1
2021-06-24 20:24:46 +00:00