Bill Yi
99dffa3013
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours am: b9925d6346
-s ours am: 7687eee85f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I3133d34aed69f46827676b1ebd82930caa98b8d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 04:01:46 +00:00
Bill Yi
9c58f1e6d5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours am: 1b68f107cf
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I220d0e40fe818db047ad044eaebf353b4c3a9453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:41:25 +00:00
Bill Yi
fc1eb27c1c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94
-s ours am: fa5c30b611
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: Ia71f310fee9bcaacc1a85cbdfa67d4a7410753b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:41:10 +00:00
Bill Yi
687ba7a903
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours am: 44f10293dd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Ic109f908fef58e17b1d2bcd2538f33140bcd5330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:40:50 +00:00
Bill Yi
7687eee85f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours am: b9925d6346
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Ie1172379e741d3e5062ea530ad2ef3af7cd44ef6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:40:25 +00:00
Bill Yi
1b68f107cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 5419d3f04e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I39d93229b5aa9287c75457e4ff245d24a028b157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:24:36 +00:00
Bill Yi
fa5c30b611
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a068e61a94
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229959
Change-Id: I84b37db6b17af0d646b7855a3e2243ef4b917dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:24:19 +00:00
Bill Yi
44f10293dd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 2a57051294
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: Id841745bd202fd7524b6707bd44260d4160cc22c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:23:59 +00:00
Bill Yi
b9925d6346
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 53322b1886
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229958
Change-Id: I41d225d2cf538ae26bdfc4a8a0aa65fddc36c8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-26 03:23:36 +00:00
Bill Yi
5419d3f04e
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-26 03:07:25 +00:00
Bill Yi
2a57051294
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-09-26 03:07:25 +00:00
Android Build Coastguard Worker
5e3b0cc0ac
Snap for 9103983 from 751384c381
to tm-qpr1-release
...
Change-Id: I7dc2874fe5d45e6939fbabea9c3cc2630d193172
2022-09-25 21:30:00 +00:00
Bill Yi
bb51df31b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 751384c381
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20035810
Change-Id: I986d17bf3773a1abb0301cfb91da042a5a818ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-25 04:30:14 +00:00
Treehugger Robot
5d95b855dc
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
am: 41e0e6fea7
am: 984e74a32e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Ib32baeda6471ed9a8a2e5aa2cd84088505c1f7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 10:26:46 +00:00
Treehugger Robot
984e74a32e
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
am: 41e0e6fea7
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: I03ee47dea1bfc1ac0f5d6f49e738346571f304e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 09:57:27 +00:00
Treehugger Robot
41e0e6fea7
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
am: 61d8dee2a0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Iaeef4967d528aca3e4d66f98952635cb97ed9350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 09:27:24 +00:00
Treehugger Robot
61d8dee2a0
Merge "Settings: Protect sensitive data on the about phone" am: 4d5951c6ef
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2146259
Change-Id: Ib4c2a39144bfe7870f39e5797cf42c75b9a49572
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-24 08:54:52 +00:00
Treehugger Robot
4d5951c6ef
Merge "Settings: Protect sensitive data on the about phone"
2022-09-24 08:23:53 +00:00
Android Build Coastguard Worker
882e4855a0
Snap for 9101843 from b775443aa1
to tm-qpr1-release
...
Change-Id: I9a0173d1b40347e4745e2c13ac1aa782b0ab5fa7
2022-09-24 05:20:52 +00:00
Bill Yi
a068e61a94
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0ad02e480a4a792ddeaa12e07a12f968659d3faa
2022-09-23 11:04:43 -07:00
Bill Yi
53322b1886
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4a5a43e5ad52047121da5fc18e8cdfb7a84e1556
2022-09-23 11:01:33 -07:00
Tom Hsu
db0ec844f2
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
am: 7c813dced4
am: 1a4f16cd70
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Idc4f0c59df19b6f0cc9a8a1db70ba546f12fafaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 08:40:25 +00:00
Bill Yi
c8be26784c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3903a5eb2bf9afbef9e01a6c8a2dd2ace0c5c371
2022-09-23 01:09:13 -07:00
Bill Yi
751384c381
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifaf8bc76ea5a8afb638a8305cd0ec1873a0e3754
2022-09-23 01:06:15 -07:00
Bill Yi
4aae182edf
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6820f433e9bc4442d0dce43f543563b3797ccfd4
2022-09-23 01:03:30 -07:00
Bill Yi
e0c4e5bdc5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia10e24de0e735de77ae7be26c0febfccf589825c
2022-09-23 01:00:36 -07:00
Tom Hsu
1a4f16cd70
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
am: 7c813dced4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Iaccb8b8c54a5f84ed3ca6fec869ba0153f4eb623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:59:37 +00:00
Bill Yi
c46e0e3d6e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If66addd4f08126800df1980cf1adba4cd71788e1
2022-09-23 00:58:17 -07:00
Tom Hsu
7c813dced4
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
am: 7e610abd3c
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Iacf9e213bb1f40859320957d7846803f4aeaa30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:32:19 +00:00
Tom Hsu
7e610abd3c
Merge "[Settings] Update UI when bluetooth connection is down." am: 8a9dc9ca90
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2225845
Change-Id: Icd4cb165939b49e24ebbc83059c55914610e7eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 07:01:01 +00:00
Tom Hsu
8a9dc9ca90
Merge "[Settings] Update UI when bluetooth connection is down."
2022-09-23 06:39:35 +00:00
Bill Yi
faa0e7298c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b775443aa1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20029095
Change-Id: I503b6ebefbf71fe8b5f2d53f34a6e241d8d5f095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 04:23:03 +00:00
Bill Yi
627c3d311c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ddab089dab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20029095
Change-Id: Idbcfa8115e14211b8d05110362858f167ee01a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-23 04:22:44 +00:00
Bill Yi
b775443aa1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-23 03:53:13 +00:00
Ats Jenk
618876c6c9
Add support to hide developer tile based on a flag
...
Define new meta-data option for development tiles that can be used to
specify a sysprop flag.
If this meta-data is present, the value will be used as the flag name
that has to be enabled for the preference to show up.
Bug: 248363970
Test: atest SettingsRoboTests:DevelopmentTilePreferenceControllerTest
Change-Id: I66d56777a6290d7fee739492bd2871f637791d75
2022-09-22 19:31:47 -07:00
Android Build Coastguard Worker
10124c9caa
Snap for 9095712 from 108b73d972
to tm-qpr1-release
...
Change-Id: I4210548093a6e1cd8da2335ba5513177790124e7
2022-09-22 23:26:31 +00:00
Bill Yi
ddab089dab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9bcf14095ff5043e49a327a29e3c48731336d78a
2022-09-22 14:14:21 -07:00
Grace Cheng
0676835aa0
Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev am: afa2bb1ea5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19994169
Change-Id: I0eb173743779ac3a88bbdfa56e77e610dc834131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 21:11:25 +00:00
Grace Cheng
afa2bb1ea5
Merge "Adds null-check on finger animation in enrollment" into tm-qpr-dev
2022-09-22 20:28:33 +00:00
Grace Cheng
59f4b7bdc9
Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev am: 108b73d972
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19995253
Change-Id: Ifc2d6aeaba2ac559b695fd1084ce6668fcc8c94e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 18:38:19 +00:00
Grace Cheng
94f6a76ea1
Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev am: 8669dc3697
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19979253
Change-Id: I9d17ad0d79285590ae460146f056b59a0d46066b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 18:37:41 +00:00
Grace Cheng
a738eba09f
Adds null-check on finger animation in enrollment
...
Adds a null-check before setting the finger animation during SFPS
enrollment
Test: Change display size to highest setting (sets mShouldShowLottie to
false), and verify that user can enroll finger successfully
Fixes: 247044864
Change-Id: I3d7f0bd3078e3a4516f656a8ee897387b0ca15c6
2022-09-22 17:54:27 +00:00
Gil Cukierman
02ef8722be
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
am: 1f750fcba6
am: ccfd44162f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I22634f05290d7c86c79e804b15a0db29d807911b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 17:50:11 +00:00
Grace Cheng
108b73d972
Merge "Fix alignment of finger animation with progress bar" into tm-qpr-dev
2022-09-22 17:37:13 +00:00
Grace Cheng
8669dc3697
Merge "Updates SFPS enrollment finished assets" into tm-qpr-dev
2022-09-22 17:26:22 +00:00
Gil Cukierman
ccfd44162f
Merge "Use AAPT2 For SettingsUnitTests" am: 594002e21a
am: 24ac97a0bf
am: 1f750fcba6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2224737
Change-Id: I43a581174938d47bb6b5aea5eb552057a5ce9b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 16:12:54 +00:00
Bill Yi
4ee0f9853a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 65c5abe617
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016648
Change-Id: Ib71a13fda76003373003419c38365936facf1de0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:31:35 +00:00
Bill Yi
1315b49ed8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1b4909f3c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016648
Change-Id: I5bf66796217c585bbc76674f0f865f7cc169d16e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:31:16 +00:00
Bill Yi
23f515945d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 4c5b5a7326
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016647
Change-Id: I896b5355f873b97256d021112dd74de1fd550899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:30:58 +00:00
Bill Yi
119210d456
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82148a40ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20016647
Change-Id: I184dedbce3f2588a9e15359ab6155403f42c21bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-22 15:30:43 +00:00