PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,229 Commits 1 Branch 0 Tags
ce8470c9253f56e9f64daf81d486b8c2e01da6a0
Commit Graph

113229 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
ce8470c925 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours am: fe9539f0a4 -s ours am: d39de8723d -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: I6856bb235f1cfdf4afb6cdab00f9492c333c07e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:47:56 +00:00
Bill Yi
ee52e953cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours am: 9d6d73301d -s ours am: f5b244dab9 -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: I961869dd0ff1d33262811d27eea1f5b8d1f77368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:47:42 +00:00
Bill Yi
5655077ed5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a -s ours am: b7eb3c0448 -s ours am: a57a4a5d9f -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: I3f8cf43918c6f43ba0b3d5a6b92eff04eacff355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:47:27 +00:00
TreeHugger Robot
600bebc206 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -s ours am: f21a4f42e3 -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: I948711d108642a4bf63aa0e602cc142bbb986f0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:40:02 +00:00
Bill Yi
b47d87506f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -s ours am: bfae5967ca -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: Ib0a1d1ac926debe1eda133648ec7e01406b9d439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:39:27 +00:00
Bill Yi
cba52dca9a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -s ours am: de2831e2ee -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: I8a7d7d1cbc7e0c7c617d29591cb7a9e64ae5c3cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:39:13 +00:00
TreeHugger Robot
d39de8723d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 377685d4a6 -s ours am: fe9539f0a4 -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: I95d8cb7517106dba6bb71741ae682e053194dcd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:12:57 +00:00
Bill Yi
f5b244dab9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30c5704504 -s ours am: 9d6d73301d -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: I81f66eea71f54d96f70c34ee93138e643fff7458
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:12:43 +00:00
Bill Yi
a57a4a5d9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff486543a -s ours am: b7eb3c0448 -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: I89c54e6f76d63a1e89cd6d6c8ca9b778547aceeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:12:28 +00:00
TreeHugger Robot
f21a4f42e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233 -s ours am: f20ec29820 -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: Ifd84d077cc733644d6e83c0809c5152eb9f43c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 17:59:29 +00:00
Bill Yi
bfae5967ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706 -s ours am: 6aa3b0a3a9 -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: I9b1559d098003b12a8d842856359353fbae3bf43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 17:59:12 +00:00
Bill Yi
de2831e2ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f841a2af4 -s ours am: cb2cb2e72a -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: I800d35d4c6a9807ea5a566fcf303612240cd3349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 17:59:01 +00:00
TreeHugger Robot
553157e063 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7d8655936b -s ours am: f314593a69 -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: I0a211cb6f5ac5f7fd83ae59a22f5d03b67a2cf3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 17:54:56 +00:00
Bill Yi
51fb0edfb0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fef55df6ec -s ours am: 7130a59266 -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: Ifbcfbe7bb52ac0155a9457b8252a3ab5743f4b32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 17:54:41 +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
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
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
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
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
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
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
60b5937fb7 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5e84134712147a92c064b7e0e85b58c201bb046e
 2022-07-14 13:24:54 -07:00
TreeHugger Robot
2fa2dc49c7 Merge "[Settings] Add NPE protection for the bundle" 2022-07-14 13:46:09 +00:00
Treehugger Robot
01afa396ce Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7 am: 2058af23ac am: 52afebe91e am: bcc4a3b4e6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: I0d20ab012bf2326724c7a56b12c117749b559275
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 12:56:41 +00:00