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
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
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
TreeHugger Robot
c4226d3a59
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4
-s ours am: 76a6621428
-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: Ied8daaa67a92cfcf08ecae26eeacb9b0863e1d91
2021-06-24 20:24:23 +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
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
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
3fb4a97104
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ca62b8d0aa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15092780
Change-Id: I8f69937d7673d2ac4e085bdf4e1609a39a17c5b2
2021-06-24 20:06:40 +00:00
TreeHugger Robot
e690d1c9ec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f0708e90f6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15095650
Change-Id: I42202ee3f1cc9bda4992b7db492ef2db750cc245
2021-06-24 20:06:15 +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