PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,104 Commits 1 Branch 0 Tags
e64f69f6cf8e8a685ea2494d9564a03323b9c5ec
Commit Graph

108104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
e64f69f6cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 60b5937fb7 -s ours am: 3050a6cb87 -s ours am: 8ca2243678 -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: Ifa4be9dbf2863454f8e9e643de42f8f954da5bf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-15 18:14:03 +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
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
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
377685d4a6 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-15 17:19:07 +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
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
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
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
bcc4a3b4e6 Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7 am: 2058af23ac am: 52afebe91e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: I29468d623adeb7f25bc4e20dcca7e3e6c3e2509a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 12:40:10 +00:00
Treehugger Robot
52afebe91e Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7 am: 2058af23ac 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: Id7da7c8d7565087f996577689c7515b3094dcf2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 12:23:06 +00:00
Treehugger Robot
2058af23ac Merge "Fix ExtraText lint errors" am: 000bc450b0 am: 91420db7c7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: I0caf8634598434942ce4e3ecd2bbd3c32adf1fb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 11:58:53 +00:00
Treehugger Robot
91420db7c7 Merge "Fix ExtraText lint errors" am: 000bc450b0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2141272

Change-Id: Ia0f5c48b9581ab8722c06e226acd59e9ac18cde3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-14 11:32:07 +00:00
Treehugger Robot
000bc450b0 Merge "Fix ExtraText lint errors" 2022-07-14 11:14:59 +00:00
Milton Wu
504a659ba5 Run lock before fingerprint enroll 
Run setOrConfirmCredentialsNow() before enrolling fingerprint for
fingerprint-only device.

Bug: 237433373
Test: atest BiometricEnrollActivityTest
Test: Manually test SUW flows for fingerprint-only device
      1. check confirm pin case
      2. check choose pin case
      3. enable always_finish_activities, check confirm pin case
      4. enable always_finish_activities, check choose pin case
Change-Id: I68da429145835fc79f83f3292749088dc25fdeee
 2022-07-14 08:40:45 +00:00
Milton Wu
bd966754ce Check portal on fingerprint intro page 
Check SUW portal flag on Fingerprint introduction page. Do not use
suw_max_fingerprints_enrollable as fingerprint count if portal flag is
enable.

Bug: 235655422
Test: m RunSettingsRoboTests \
      ROBOTEST_FILTER=FingerprintEnrollIntroductionTest
Test: Manually test "Add another finger" on Deferred and Portal
      suggested actions page
Change-Id: I2789d95fb214b5da6d8d03ef77583d064652e69e
 2022-07-14 05:28:46 +00:00
Nate Myren
d18f11a84f Remove location toggle from privacy controls screen 
Bug: 238857896
Test: manual
Change-Id: Ifc4ccc13271c42a0dd1941e8f26842afbe0411d6
 2022-07-13 11:31:16 -07:00
Grace Cheng
b04079323c Merge "Update SFPS Enrollment to have error messages replace title" into tm-qpr-dev am: e287bbe82b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19264894

Change-Id: Ie4c31048df6afc3dcb115abebdabe100ffd12fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 17:26:17 +00:00
SongFerng Wang
b59e099ce6 Merge "[WFC] The WFC UI did not refresh after the subscriptionInfoChanged" into tm-qpr-dev am: dc6f2df00e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19222900

Change-Id: Id4d3e4fe19aa697fb465d5d572cbb3ed7cf6be41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 17:26:05 +00:00
Grace Cheng
e287bbe82b Merge "Update SFPS Enrollment to have error messages replace title" into tm-qpr-dev 2022-07-13 17:21:16 +00:00
SongFerng Wang
dc6f2df00e Merge "[WFC] The WFC UI did not refresh after the subscriptionInfoChanged" into tm-qpr-dev 2022-07-13 17:15:12 +00:00
Grace Cheng
dc82b6364e Update SFPS Enrollment to have error messages replace title 
Update SFPS Enrollment to have error messages replace title rather than showing error messages underneath the fingerprint animation

Fixes: 234135107
Test: Enroll finger and see error messages replace title
Change-Id: I106a0147bf69d8dfab99d58e9e309cfb32c650fa
 2022-07-12 22:57:17 +00:00
TreeHugger Robot
005876ae80 Merge "Add function getBatteryHistorySinceLastFullCharge, used to replace getBatteryHistory in BatteryHistoryLoader." into tm-qpr-dev am: 51d087cd67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235232

Change-Id: Ic7576a9592b3b9ef71af52001c02f0db17a41312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 16:56:03 +00:00
TreeHugger Robot
a51b1baeaa Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev am: fedab69c9a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19235726

Change-Id: I2d241c16e537f0131a95f70528dd47c75791f0ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 16:54:06 +00:00
TreeHugger Robot
51d087cd67 Merge "Add function getBatteryHistorySinceLastFullCharge, used to replace getBatteryHistory in BatteryHistoryLoader." into tm-qpr-dev 2022-07-12 16:47:13 +00:00
TreeHugger Robot
fedab69c9a Merge "Support multi-user privacy for battery usage chart" into tm-qpr-dev 2022-07-12 16:40:32 +00:00
SongFerngWang
d9bc33e3b5 [WFC] The WFC UI did not refresh after the subscriptionInfoChanged 
Add the listener for subscriptionInfoChanged and update the Visible
of the category.

Bug: 233783112
Test: atest NetworkProviderWifiCallingGroupTest
Change-Id: I7698915abb2f3b0ba2b40d8e78fe4e3302756c91
 2022-07-12 14:58:50 +08:00
Automerger Merge Worker
fade53b067 Merge changes from topic "am-a9e26c3082994f7bbaad0b98192988d9" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours am: 0996cb11ee -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours am: 28d5ffe9a8 -s ours
 2022-07-12 05:46:20 +00:00
TreeHugger Robot
d620c34d5d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours am: 0996cb11ee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56e4bfdf0190d197f3bc00a7a3d7287de8258703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:45:12 +00:00
TreeHugger Robot
bc13166ecb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours am: c2908edff1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a255d4da726411e182e92ca2b65758b77bcc618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:44:56 +00:00
Bill Yi
32381c7e8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours am: 28d5ffe9a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5333f30565a106b7cbc0bbb1d338769bfc189122
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:44:53 +00:00
Bill Yi
4781a12d96 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours am: fd7fcb1094 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4d8e99c928af01463aebee593b3e199f969a1c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:44:32 +00:00
TreeHugger Robot
c2908edff1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43af99d9dbdedea318fd7d53bf341629efb56624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:19:43 +00:00
Bill Yi
fd7fcb1094 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67076fc837020ff031bb770a9174889dc3e28284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:19:17 +00:00
TreeHugger Robot
0996cb11ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0db9d786ee29749691bd8093a1482a4035a16b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:18:25 +00:00
Bill Yi
28d5ffe9a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib108c314f79f1fc0cc71ec9cb37b6d4f33e3bc6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:17:57 +00:00
TreeHugger Robot
0e046fc4ae Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-12 04:54:58 +00:00
Amy Hsu
bb1c1a9954 [automerger skipped] Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: ef540c685d -s ours 
am skip reason: Merged-In Ib4622490b0f63139b47f242ebcae916edf291cea with SHA-1 7087e5c457 is already in history

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

Change-Id: I9792a751ac493ecf4435a19f129d5590bedc1752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:48:32 +00:00