Hugh Chen
ff719d5bd8
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
am: bee2daea18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915
Change-Id: I8a2a91ce7420f647f5b6c3a76a31686049ba3011
2021-06-28 06:36:30 +00:00
Hugh Chen
60beadd631
[automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc
-s ours am: 76545f383c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913
Change-Id: I14dceb2e7d17451f831bdf124387a4e76d744579
2021-06-28 06:36:23 +00:00
Hugh Chen
bc51750bf1
[automerger skipped] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
am: a11ed686d4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915
Change-Id: I47d3d52d1f11879e049bef336d0dde464b5de048
2021-06-28 06:18:50 +00:00
Hugh Chen
9eef0e089d
[automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc
am: 91d5f08e39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913
Change-Id: I4ce2d29b73bd2db7ba3cb74cad46515eba64e425
2021-06-28 06:18:45 +00:00
Hugh Chen
bee2daea18
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915
Change-Id: I28b33a8286af88bc1b494cd325cb946e9ccca554
2021-06-28 06:15:26 +00:00
Hugh Chen
76545f383c
[automerger skipped] RESTRICT AUTOMERGE Update string am: 9356205dfc
-s ours
...
am skip reason: skipped by user hughchen
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913
Change-Id: Ieec3c3403fe68257bbd3c04ec2395af202e2b28d
2021-06-28 06:15:18 +00:00
Hugh Chen
a11ed686d4
RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message am: a5046f219a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021915
Change-Id: I66e622edb04b797035548be5e8e5bff1585d44a1
2021-06-28 06:07:14 +00:00
Hugh Chen
91d5f08e39
RESTRICT AUTOMERGE Update string am: 9356205dfc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021913
Change-Id: I39be0753d272bcde0b4ade53ae3afc74a67155f8
2021-06-28 06:07:09 +00:00
TreeHugger Robot
85524a7276
[automerger skipped] Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev am: 9c105d911a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15021916
Change-Id: Id5025c35217126e88af7d100fff6960699d3ae94
2021-06-28 06:06:38 +00:00
TreeHugger Robot
1c6594bcd4
[automerger skipped] Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev am: b2b280a67a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15016136
Change-Id: I675c537b664572cdd7a097aa0516dfd6fce6055b
2021-06-28 06:06:32 +00:00
TreeHugger Robot
9c105d911a
Merge "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" into rvc-qpr-dev
2021-06-28 05:55:46 +00:00
TreeHugger Robot
b2b280a67a
Merge "RESTRICT AUTOMERGE Update string" into rvc-qpr-dev
2021-06-28 05:55:26 +00:00
Bonian Chen
f4a80fdfa3
Merge changes from topic "revert-15102785-Fix build break of refactor ActiveSubscriptionsListener-TNZMDOZYZU" into sc-dev
...
* changes:
Revert "[Settings] Fix build breakage"
Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..."
2021-06-28 05:28:07 +00:00
Bonian Chen
4c4d8e3a08
Revert "[Settings] Fix build breakage"
...
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener
Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage
Change-Id: Ifb1a579863df157b41aebbdf59ad7e4584efa866
2021-06-28 05:23:33 +00:00
Bonian Chen
69fc8e0ccd
Revert "Revert "Revert "[Settings] Code Refactor - ActiveSubscip..."
...
Revert submission 15102785-Fix build break of refactor ActiveSubscriptionsListener
Reason for revert: Build breakage.
Reverted Changes:
I9ae819f06:Revert "Revert "[Settings] Code Refactor - ActiveS...
I15819472b:[Settings] Fix build breakage
Change-Id: Ib830b7b00504264a703a03a00bfdfcf65135d394
2021-06-28 05:23:33 +00:00
TreeHugger Robot
3d5fd19e9f
Merge "Consistent color between status bar and app bar" into sc-dev
2021-06-28 04:25:09 +00:00
Bonian Chen
c437177d4b
Merge "Revert "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener""" into sc-dev
2021-06-28 03:59:43 +00:00
Bonian Chen
bf4120f3f8
Merge "[Settings] Fix build breakage" into sc-dev
2021-06-28 03:59:43 +00:00
Arc Wang
3625cf50aa
Merge "Shows ripple effect inside CardPreference's rounded rectangle" into sc-dev
2021-06-28 03:43:59 +00:00
TreeHugger Robot
0bea498ae1
Merge "Fix switch behavior with switch access" into sc-dev
2021-06-28 03:01:29 +00:00
Arc Wang
465560d388
Shows ripple effect inside CardPreference's rounded rectangle
...
contextual_card_background is a drawable which shows ripple.
Sets contextual_card_background as the foreground of
MaterialCardView.
Bug: 191617809
Test: manual visual
Change-Id: I09ee886fe56e443626042682381560ed0f32d51d
2021-06-27 15:59:18 +00:00
TreeHugger Robot
1060b2f926
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-06-26 05:16:50 +00:00
TreeHugger Robot
e78163f7c7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 28dbcbf459
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115834
Change-Id: I582c95f5d4f7e1ae9ec4b3e4914e0ba4891242bb
2021-06-26 05:15:41 +00:00
Bill Yi
4621b36198
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef757416ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15116032
Change-Id: Ia2f670479503f1f1c2aacb2d04d7d0d7c5814cb7
2021-06-26 05:15:33 +00:00
TreeHugger Robot
28dbcbf459
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-06-26 05:13:39 +00:00
TreeHugger Robot
ce6e84f830
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: b92673984b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15115837
Change-Id: I88919988edfdee2caa05df3317f351e903e10f31
2021-06-26 05:11:35 +00:00
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
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
477c5d9cde
Merge "Updated fp bad calibration string" into sc-dev
2021-06-25 22:37:01 +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
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
17608ff21a
Merge "Update string to enable transcode via MTP" into sc-dev
2021-06-25 08:24:27 +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
f9aa12f4d9
Merge "Revert "[Settings] Code Refactor - ActiveSubsciptionsListener"" into sc-dev
2021-06-25 02:17:59 +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