PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,816 Commits 1 Branch 0 Tags
1cdd5923f86bb4b78d9530ba4275900ab6e1d5cc
Commit Graph

99816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
9d56130c5e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie7fde007b60291d37ac3283c0037c3717b2798be
 2022-01-14 09:11:12 +00:00
Bill Yi
3bf676d7ce Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic57de1e9085d2e5ebc2a4eaaa38bdcbc1af70090
 2022-01-14 09:09:42 +00:00
Bill Yi
773b2ab9c6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f5e527ab2fe26cb1cfba41e8921926377d1050a
 2022-01-14 09:08:04 +00:00
Bill Yi
309dfa85f8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I14169aab5b628d8559680f553d43488f98a3e61b
 2022-01-14 09:05:29 +00:00
Bill Yi
10d639c48e [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1ec6a5c572 
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16637232

Change-Id: I3b08321cd58164eb1885c6ed0775a86a8a6bec3c
 2022-01-14 09:02:03 +00:00
Bill Yi
1ec6a5c572 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I25e71adccb1ccbdad52e5c659c22708388010c70
 2022-01-14 09:01:53 +00:00
Bonian Chen
3fe40484ba [Settings] Adjust code for performance 
Reorder code flow to reduce redundent work.

Bug: 213836977
Change-Id: Ifd57d1f6a007d6a1c9bcae597e6e9674ce54d8bc
Test: Junit VpnPreferenceControllerTest
 2022-01-14 08:41:46 +00:00
Joshua Mccloskey
0902b44744 Added lottie animations for udfps side/tip 
Bug: 209807883
Test: Verified animations show for multiple devices.
Change-Id: Ic63a0eca226309b92aa64cb4f80791ef179b8154
 2022-01-14 07:30:08 +00:00
Xinyi Zhou
7871ccff33 Add Fast Pair to System Settings 
Test: manual - took a screen capture https://photos.app.goo.gl/YgkVkAqxib4DwFs49 unit tests passed.
Bug: 203579197

Change-Id: Ie15ede111f7cdd1fc635fb9c475fe210d3f7f91b
 2022-01-13 23:26:35 -08:00
Daniel Hsieh
6f4fb88538 Support following typing focus in window mode [3/n]. 
There are 3 milestones in this feature.
1. Refactor the callbacks for Accessibility in WindowManagerInternal.
2. Implement this feature in such new architecture.
3. Implement the setting choice in preference page.

This CL is for the 3rd milestone.

We add a preference key "magnification_follow_typing" to access and
update the ACCESSIBILITY_MAGNIFICATION_FOLLOW_TYPING_ENABLED value
which controls its corresponding preference page UI.

Bug: 194668976
Test: make RunSettingsRoboTests ROBOTEST_FILTER=
	MagnificationFollowTypingPreferenceControllerTest
	ToggleScreenMagnificationPreferenceFragmentTest
Change-Id: Ib2602c997a535c1acca6a7ddd7bb2c25921f9280
 2022-01-14 07:11:05 +00:00
Bonian Chen
f280687ac7 Merge "[Settings] Code refactor for modulization" 2022-01-14 06:25:20 +00:00
Bonian Chen
f2e91f826b [Settings] SIM colors are referenced by getIntArray() within source code 
SIM colors are referenced by getIntArray() within source code

Bug: 211956916
Test: build pass
Change-Id: Idefac365e750e454a2c3c98b2b4f17acbe143820
 2022-01-14 05:52:13 +00:00
Bill Yi
0179fc901f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibe78ecd75a57eabe935572964ce4f941dcbe18d7
 2022-01-14 03:46:33 +00:00
TreeHugger Robot
8e7a57e8fa [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours am: b03be4ee77 -s ours am: 71522952f1 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I040e75da2e1c1d59a9298c754edf555b2c02ccd2
 2022-01-13 22:42:55 +00:00
TreeHugger Robot
b90bfefe78 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours am: cead5cdd6e -s ours am: 6d75af0ee9 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: Ib782f2aa972f3d24f3360dba064f82ffdad73519
 2022-01-13 22:42:22 +00:00
TreeHugger Robot
71522952f1 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours am: b03be4ee77 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: Id3435eb8d89dc1b74edc98c9c91677d9a3e391f8
 2022-01-13 22:32:24 +00:00
TreeHugger Robot
6d75af0ee9 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours am: cead5cdd6e -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I373243ef1114d78c3eb780e6f788110607a747e6
 2022-01-13 22:31:31 +00:00
Eric Biggers
d8639ee7d0 Merge changes from topic "remove-fde" 
* changes:
  Remove FDE support from accessibility settings
  Rename crypt_keeper_* strings that are still used
  Remove CryptKeeperSettings
  Remove CryptKeeper
 2022-01-13 22:17:13 +00:00
TreeHugger Robot
cead5cdd6e [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I946974d58d0ad5d136e19c801a72b1db186088f9
 2022-01-13 22:14:37 +00:00
TreeHugger Robot
b03be4ee77 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: fc22f7f99f -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: Ib8c693ca5216a18a75857792387d780d7de163a6
 2022-01-13 22:14:01 +00:00
TreeHugger Robot
61748a9f14 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours am: 7f81d953d7 -s ours am: 37f92a2bf8 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I4355911bec4070894042f209f18a99d0fb3537b2
 2022-01-13 22:13:19 +00:00
TreeHugger Robot
3309f1a448 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours am: a4f683f53e -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I70d88c7617063536ee49b4c6ee558da5aa38b18b
 2022-01-13 22:13:10 +00:00
TreeHugger Robot
5d7ad05e2b [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours am: 87cbf72d91 -s ours am: 42aa6b082a -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I069e82d8bc9b3327a84fa25cb51d7e893fecdf86
 2022-01-13 22:12:58 +00:00
TreeHugger Robot
37f92a2bf8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours am: 7f81d953d7 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: Ie566122baf441baa4d82bf7234f36ea50979c85b
 2022-01-13 22:06:16 +00:00
TreeHugger Robot
fc22f7f99f [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: If75738f8e8c3e4e6febfd77710e81613978153f2
 2022-01-13 22:02:06 +00:00
TreeHugger Robot
42aa6b082a [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours am: 87cbf72d91 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I98ac2843b0a81d0ef4356c96e41d6d8b3456c7d3
 2022-01-13 22:01:20 +00:00
TreeHugger Robot
a4f683f53e [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours am: 8a91ea7add -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I115e726c34bef7c2c763c55f12e3af244527e449
 2022-01-13 22:00:54 +00:00
TreeHugger Robot
7f81d953d7 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I76abaa00ee0d4d99d452dd4b1be88cca5ac5b6d0
 2022-01-13 21:50:50 +00:00
TreeHugger Robot
87cbf72d91 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 0abbff1a86 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: Id720143da3b485fd9a01bdaaa6a31064029ad70b
 2022-01-13 21:50:48 +00:00
TreeHugger Robot
f12e9ec4e3 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours am: 3c427d1702 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: Ic2c931252de442b433b874f2290cbfc1510a9e59
 2022-01-13 21:49:56 +00:00
TreeHugger Robot
8a91ea7add [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 97729a9e16 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: If02ad441dd23232075e4fbe9b1927e795aed175e
 2022-01-13 21:43:35 +00:00
TreeHugger Robot
0abbff1a86 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I3a13d6cf9644292e474c5554e6423072aca2fb67
 2022-01-13 21:37:42 +00:00
TreeHugger Robot
3c427d1702 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours am: 616aecf1ec -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I4c7244679855404fd5842d0e3e7ab407a6d07f4f
 2022-01-13 21:36:49 +00:00
TreeHugger Robot
616aecf1ec [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours am: 02a19ec59d -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: Iacff1f7f942431bba6f09a9f500a8e60ea394824
 2022-01-13 21:25:16 +00:00
TreeHugger Robot
f0c66b61ce [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours am: 887a7b5c43 -s ours am: 16e91b5782 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I26e4f45f305f1ef9dfa919e68c1c0d374b84ce8c
 2022-01-13 21:20:02 +00:00
TreeHugger Robot
06b045547a [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours am: 638c6fb3fc -s ours am: f4dd91931b -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: Ic469d219fce25a0a5e367d5d39a7b60ccbb8a6a3
 2022-01-13 21:19:41 +00:00
TreeHugger Robot
97729a9e16 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I0c4662c0cda74c28d2385ade52a345e84086bbc9
 2022-01-13 21:06:55 +00:00
TreeHugger Robot
02a19ec59d [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into rvc-dev am: 3f6a48a552 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577204

Change-Id: I34d7fec987c297fbb846888d9cf187d0a0f7321c
 2022-01-13 21:06:50 +00:00
TreeHugger Robot
16e91b5782 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours am: 887a7b5c43 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I664394c55298a4bb751f9d709c3ff4a54b098cae
 2022-01-13 21:06:23 +00:00
TreeHugger Robot
f4dd91931b [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours am: 638c6fb3fc -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I9100456ceedb6b084af41000054d033dde94ff86
 2022-01-13 21:04:38 +00:00
TreeHugger Robot
f7995298c5 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours am: f74fe2981a -s ours am: 095c123e60 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I2a1bf9fe9e7eaa8d1a4053ad73092c2ac8fa658c
 2022-01-13 20:51:05 +00:00
Automerger Merge Worker
50f73dae18 Merge "[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: 67f53e247a -s ours am: 01739e127c -s ours am: 3e06e0c112 -s ours am: 76fba21fa8 -s ours" into sc-v2-dev-plus-aosp am: aebae8faba -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 6407b20ab3 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I297ac9fbfdcd0c866f6283645c247c35855a5d06
 2022-01-13 20:50:53 +00:00
TreeHugger Robot
62c0e2a7a8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: ab8b39c5e0 -s ours am: 701fe2cfde -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: Ib32e2370dff4232ccf07726578aee291fe2b3d90
 2022-01-13 20:50:39 +00:00
TreeHugger Robot
638c6fb3fc [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I59fe851b88df7c4fbf48c384c78d9af03bc7c673
 2022-01-13 20:50:16 +00:00
TreeHugger Robot
887a7b5c43 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 9f4837e276 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: Ia6e5b90c5642742dd540e9a2d15efa51dfffa174
 2022-01-13 20:50:16 +00:00
Automerger Merge Worker
1513a9845d Merge "[automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: 45bfdf58b9 am: d8e43e80c0 -s ours" 2022-01-13 20:49:18 +00:00
TreeHugger Robot
72c6695ec8 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into qt-dev am: 50b65a168a am: 1ef5f42b54 am: f43f129dc0 am: d902f8c7d6 am: ea3d0361c8 am: 3a4ebbfcec am: 45bfdf58b9 am: d8e43e80c0 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577205

Change-Id: I1354f8ae1e127cab688de0a10d670af5e0bf5e8f
 2022-01-13 20:49:12 +00:00
TreeHugger Robot
b321a097f6 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours am: 5f960a59ba -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I7191797d5ad7ff1d89e499eafcd3211bddd03119
 2022-01-13 20:49:06 +00:00
TreeHugger Robot
3f6a48a552 Merge "Add caller check to com.android.credentials.RESET" into rvc-dev 2022-01-13 20:43:35 +00:00
TreeHugger Robot
9f4837e276 [automerger skipped] Merge "Add caller check to com.android.credentials.RESET" into sc-dev am: b04e0ab405 -s ours 
am skip reason: Merged-In I9dfde586616d004befbee529f2ae842d22795065 with SHA-1 35e3d0c1b0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16577203

Change-Id: I858b821fe9d17c4c46d61cb0dc57025b454cbc7e
 2022-01-13 20:32:00 +00:00