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
49e4eb1151
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: Id8a5e8f5fecb64d087bbadb3b02c6f638bf6ba81
2021-06-25 02:16:58 +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
86bde2c213
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-06-24 21:33:01 +00:00
TreeHugger Robot
d30b0c9cec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489
-s ours am: 0d307d31fa
-s ours am: 9422f32573
-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: I84f97ce9449909d9808653bc62684e7bfec8e199
2021-06-24 21:01:57 +00:00
TreeHugger Robot
1621228ccd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489
-s ours am: 6225c4a3af
-s ours am: 15118dbc4a
-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: Ia09ff723fabbb664e7e2493ab26a8de9a3e53552
2021-06-24 21:01:28 +00: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
253b2d40c8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 54c1ff8489
-s ours am: be8c22ca76
-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: If63fcc899fd9e51524d67b6fb280b64992531366
2021-06-24 20:51:42 +00:00
TreeHugger Robot
ba76ed7723
[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: 48386d90db
-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: I03454bdc42fd56cc79b9fac3ed46e1577edfd140
2021-06-24 20:43:08 +00:00
Bill Yi
5bafb09498
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f
-s ours am: 3e45d30cfb
-s ours am: 6ace7cdcb2
-s ours am: 5026a41048
-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: Ibb21eaaeef1ce59ae12ba029a31d2c213f5d87f6
2021-06-24 20:42:53 +00:00
TreeHugger Robot
64fadf60ef
[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: 9f8f4b76ef
-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: I4cf27e04655c46d7976c19327758a20a9318bf76
2021-06-24 20:42:37 +00:00
Bill Yi
623470d7f4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851
-s ours am: 06ffb62957
-s ours am: 3716c2a75f
-s ours am: 2aba6cdc90
-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: I4e3baaf8da2c84067ed7806815beca7dc161ad4b
2021-06-24 20:42:28 +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
cf76e9ba84
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4
-s ours am: 2ac3bc7a2a
-s ours am: 3cf6d9a4e8
-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: Ic96831c4f8a71a4de35c7b6bc5fc60b97bb0d7a8
2021-06-24 20:41:44 +00:00
TreeHugger Robot
be8c22ca76
[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: I2a842384ca11e4bf25585941a48e734599135fb0
2021-06-24 20:41:38 +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
b143d2abed
[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: 72365e1ed7
-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: I6d82f292eeab02892bcda98e5540453f953244ec
2021-06-24 20:25:17 +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
6fcf36dd07
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f
-s ours am: 3e45d30cfb
-s ours am: a6268f29d4
-s ours am: 2ba9db792e
-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: Iefa8981597537d3e498cb3646d200ff1f64fb0b4
2021-06-24 20:25:12 +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
89bd336b50
[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: 2972123126
-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: I6f2c151cfcb00f1bcb5562b1e1caa80658bd6aea
2021-06-24 20:25:07 +00:00
Bill Yi
5da4aa3d50
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 342b2ae851
-s ours am: 06ffb62957
-s ours am: fb3e0ff793
-s ours am: 6e950044c0
-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: I1b5ea97edaeaa7111b5ff89f87673046d7813b51
2021-06-24 20:25:02 +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
508e9c7a99
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edeef947e4
-s ours am: 76a6621428
-s ours am: c4226d3a59
-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: I1ef8947a2c26a945d4c546f62bc6dca0e68a704c
2021-06-24 20:24:44 +00:00
TreeHugger Robot
d36123e04e
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: ca62b8d0aa
-s ours am: 3fb4a97104
-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: Iaab4a609bb0f3ee49333ed07c94dd9a90f434020
2021-06-24 20:24:39 +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
23903da4b9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: f0708e90f6
-s ours am: e690d1c9ec
-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: Ib1029d02f1125f8e321c084ca43c1cc9f9ebca3e
2021-06-24 20:23:54 +00:00
TreeHugger Robot
2e9a4489db
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 483f978ba7
-s ours am: b8bd54cd94
-s ours am: 4b811bbe2a
-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: Ifd5fe313578b51ee414e6ca07e32f1f288319ea3
2021-06-24 20:23:44 +00:00
Bill Yi
4a92a84003
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8198514a9f
-s ours am: 3e45d30cfb
-s ours am: d8c874e5c6
-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: I5431685d903a98466027994827d8d147c39af823
2021-06-24 20:23:29 +00:00
TreeHugger Robot
4b811bbe2a
[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: If0bc45d18a5a5ad32d977f2c1d5882710676a210
2021-06-24 20:18:41 +00:00
Bill Yi
d8c874e5c6
[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: I9f329c4702d335f325c18b3f6c7d44734ebc4fde
2021-06-24 20:18:37 +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