Bill Yi
6f2aa0d0f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec
-s ours am: 84ce084f90
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I67f6ad3b81dc663a6ab41c510eb0558f9fdc3840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:54:40 +00:00
Bill Yi
ea80c38015
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7
-s ours am: bc5abed2bd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I748899370ed54bc7947644656b8fece6e81dda2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:54:23 +00:00
Bill Yi
5d112b0212
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7
-s ours am: 1f4f268d56
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I200f7a103a39b50b504325f2d7c2705b49886bcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:54:22 +00:00
TreeHugger Robot
4479132675
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b
-s ours am: 188a2c66c1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I4d19d7074349e78da6ba23ef7f781968d270e980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:45:59 +00:00
Bill Yi
da2052f884
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec
-s ours am: cdd61bac15
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: Ia975276fc9ef9cc8edb76cdc9ed5f7a761eeb8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:45:44 +00:00
Bill Yi
8ca2243678
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7
-s ours am: 3050a6cb87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I69eef3df05e16dec54876cc89bdc069747318828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:45:24 +00:00
TreeHugger Robot
fe9539f0a4
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: Ie5ea5d6931a58e9f21fd9a30b21ae6575c394fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:44:19 +00:00
Bill Yi
9d6d73301d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294505
Change-Id: Ic146ce400d245dd4c6e6a27a26c5094c9f14748f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:44:03 +00:00
Bill Yi
b7eb3c0448
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294494
Change-Id: I80eea9dcf4cae2c3c872fe41d3c1ee8c6536e6d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:43:48 +00:00
TreeHugger Robot
f20ec29820
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I7f6106fcdf78ce8f3a335c75a27bf8e794326ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:37:18 +00:00
Bill Yi
6aa3b0a3a9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I989899b2f11e906218ee445f603d46973e88af05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:37:05 +00:00
Bill Yi
cb2cb2e72a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287432
Change-Id: I39cd22fa5a5ece6def936a0501f4226b5925a414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:36:46 +00:00
TreeHugger Robot
8359385233
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-07-15 17:29:43 +00:00
TreeHugger Robot
188a2c66c1
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I07ea1b35c425ddda94d74d61f69d50eac84517b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:29:37 +00:00
Bill Yi
cdd61bac15
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I43aaa9d814fe81b7bdbcd363f66b214dc7f8949b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:29:19 +00:00
Bill Yi
3050a6cb87
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I0697c0805e26144de9fe00eaaf8fee2ad864f7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:29:02 +00:00
TreeHugger Robot
f314593a69
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: If39d1081ebb04b14368037cc6a70087d045effa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:26:01 +00:00
Bill Yi
7130a59266
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: I394197a50e1790daf85e8b414137df8aac5e4210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:25:44 +00:00
Bill Yi
1f4f268d56
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: I61cef0ec239d8cdafd55713defc314110480ece0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:25:27 +00:00
TreeHugger Robot
3ff66be05a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: Ia7d530db0b0b29d1f927da0ef723360a69a14b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:25:19 +00:00
Bill Yi
84ce084f90
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19294496
Change-Id: Ib17ef4b92b91a29d269755ff32c20197c18cfb18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:25:03 +00:00
Bill Yi
bc5abed2bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293984
Change-Id: Ibdf0138afbf959edefbf88629e3d5f79ac2097c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 17:24:44 +00:00
TreeHugger Robot
377685d4a6
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-07-15 17:19:07 +00:00
TreeHugger Robot
7d8655936b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-15 16:56:40 +00:00
Menghan Li
95c771c02f
Merge changes Ia52cd272,Ie8acdcb8
...
* changes:
Refactor CaptionAppearanceFragment to improve maintainability (2/n)
Refactor CaptionAppearanceFragment to improve maintainability (1/n)
2022-07-15 11:47:37 +00:00
TreeHugger Robot
8f36fb7fda
Merge "[Le Audio] Use the ThemeResolver instead of setTheme() to avoid the theme res may be updated in the future and we need to update it manually."
2022-07-15 10:31:08 +00:00
Zoey Chen
5e9a00f72f
[Le Audio] Use the ThemeResolver instead of setTheme() to avoid the theme res may be updated in the future and we need to update it manually.
...
Bug: 238841204
Test: manual
Change-Id: I3801f23244f6f54b6147390edccf026da1f0f9c6
2022-07-15 06:56:36 +00:00
TreeHugger Robot
0936f72020
Merge "Save isCanceled state and restore when rotation" into tm-qpr-dev am: 3028e52501
am: 3928fcabab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267966
Change-Id: Ic6dc3e346111fa03331e1ad3509b106a6672a9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 05:54:47 +00:00
Bill Yi
df061723cb
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: cc75b57a54
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19293978
Change-Id: Id8564c9f3d02e96b549c3d00ca4029fea9d2db3f
2022-07-15 05:37:42 +00:00
TreeHugger Robot
3928fcabab
Merge "Save isCanceled state and restore when rotation" into tm-qpr-dev am: 3028e52501
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267966
Change-Id: I6072236085c1feec6588d8b06931517086f32d48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 05:21:45 +00:00
TreeHugger Robot
3028e52501
Merge "Save isCanceled state and restore when rotation" into tm-qpr-dev
2022-07-15 05:03:40 +00:00
Wesley Wang
1c3cbc9c24
Merge "Add dock charging state into stay awake feature (1/2)"
2022-07-15 02:55:30 +00:00
TreeHugger Robot
dc6fc8711c
Merge "Run lock before fingerprint enroll" into tm-qpr-dev am: e49a84480b
am: 14f791bf73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19260206
Change-Id: I30a019887d77c29f88e97c83cb25327910558aba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 00:55:20 +00:00
TreeHugger Robot
9adbde0a8f
Merge "Check portal on fingerprint intro page" into tm-qpr-dev am: 9fcf073bab
am: f14704504b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267972
Change-Id: I48a8397229e527254c7b96c7cd60ae9be46c6837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 00:54:23 +00:00
TreeHugger Robot
14f791bf73
Merge "Run lock before fingerprint enroll" into tm-qpr-dev am: e49a84480b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19260206
Change-Id: I72fbe236492e87c7b6d23c0de36c8dd307f035e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 00:43:02 +00:00
TreeHugger Robot
e49a84480b
Merge "Run lock before fingerprint enroll" into tm-qpr-dev
2022-07-15 00:37:04 +00:00
TreeHugger Robot
f14704504b
Merge "Check portal on fingerprint intro page" into tm-qpr-dev am: 9fcf073bab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19267972
Change-Id: I738b4d76e633f359cdaedc4fee43f0975c60e7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 00:33:48 +00:00
lbill
d7f53d4180
Save isCanceled state and restore when rotation
...
- Create mIsCanceled field in FingerprintEnrollEnrolling
- Override onSaveInstanceState and save mIsCanceled state
- onCreate restore mIsCanceled
- shouldStartAutomatically() return mRestoring && !mIsCanceled
- Integrate FingerprintErrorDialog with "try again"-> Clear mIsCanceled
Bug: 237103873
Test: manual enroll UDFPS, and wait for timeout, seeing timeout error
dialog showing above fingerprint enrollment pad.
Change-Id: I3a3010ca12aa0b23fd122a8afc9b82adf5656fb8
2022-07-15 08:14:53 +08:00
TreeHugger Robot
9fcf073bab
Merge "Check portal on fingerprint intro page" into tm-qpr-dev
2022-07-15 00:08:59 +00:00
menghanli
3a591f9a34
Refactor CaptionAppearanceFragment to improve maintainability (2/n)
...
Root cause: There is a bunch of different logic of preferences in CaptionAppearanceFragment. It’s hard to implement new features and hard to maintain and hard to be testable.
Solution: Move out font size and type face preference logic of CaptionAppearanceFragment into controllers to reduce the complexity of the relationship between preference and fragment.
Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: Ia52cd272495d49a772c981f51e190ff7d29ee14f
2022-07-15 06:55:54 +08:00
Nate Myren
22e23bf4e5
Remove location toggle from privacy controls screen am: d18f11a84f
am: b055df3b8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19281813
Change-Id: I501b834e2fff7655a94eb32e0d1d552ed8709774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-14 21:11:05 +00:00
Nate Myren
b055df3b8c
Remove location toggle from privacy controls screen am: d18f11a84f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19281813
Change-Id: I7b2286f4cfbb022ea6cdfffa9ef1b42da6a05062
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-14 20:52:30 +00:00
Bill Yi
30c5704504
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic8eeb16a4833dccdf9924faefd2b2b341ec2d1da
2022-07-14 13:47:48 -07:00
Bill Yi
0f98a4d1ca
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie645e16d70b654b0ed4655392f42ffcb4c38a2f5
2022-07-14 13:42:55 -07:00
Bill Yi
fef55df6ec
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8d79670567a1f2b81f59e9a447c27fcde72a0c4e
2022-07-14 13:38:25 -07:00
Bill Yi
afade3370f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I42a4459e739fd333a5e7be62689cf8d4573134c5
2022-07-14 13:33:21 -07:00
Bill Yi
2ff486543a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I089f4ebab3776b2e32596948e43eb1564f38273d
2022-07-14 13:28:43 -07:00
Bill Yi
e148a29a1c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3a97f3d110f4255be27847ab9d25dd758daa29d4
2022-07-14 13:26:48 -07:00
Bill Yi
60b5937fb7
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5e84134712147a92c064b7e0e85b58c201bb046e
2022-07-14 13:24:54 -07:00
Bill Yi
93eded6c60
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I753231111145b44ea246f6a578410856b4d13329
2022-07-14 13:23:00 -07:00