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

113202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Zoey Chen
a3ba183165 [Settings] Add NPE protection for the bundle 
Bug: 238980691
Change-Id: I0f5e79ab83701552bc92b07ebdc0ee90b700721f
Test: atest EnabledNetworkModePreferenceControllerTest
 2022-07-14 11:10:51 +00:00
TreeHugger Robot
501cc9837a Merge "Add class BatteryLevelData used to parcel the battery timestamps and levels. It behaves as an interface between UI and data." 2022-07-14 10:30:00 +00:00
TreeHugger Robot
ec12b84624 Merge "[Settings] Add NPE protection for the bundle" 2022-07-14 10:25:21 +00:00
menghanli
591e44bb99 Refactor CaptionAppearanceFragment to improve maintainability (1/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 preview 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: Ie8acdcb8659606ce3faf6d5532cc73ee19024725
 2022-07-14 16:55:08 +08: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
Kuan Wang
d2fcbf4120 Add class BatteryLevelData used to parcel the battery timestamps and 
levels. It behaves as an interface between UI and data.

Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: I4f79165125254ce1372abf1a207411a183aabb23
 2022-07-14 16:34:42 +08:00
Zoey Chen
44bc703bf2 [Settings] Add NPE protection for the bundle 
Bug: 238980691
Test: atest MobileNetworkIntentConverterTest
Change-Id: I39d0f86725f6b0ef477425fb901bb274f31c6d78
 2022-07-14 08:32:02 +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
Kuan Wang
66e146706d Use Mockito 4.6.1 API for BatteryChartPreferenceControllerV2Test 
Fix the build breakage.

Bug: 238962112
Test: make RunSettingsRoboTests
Change-Id: Ib85c8dc8e68b1f622dbd37dca5e79484f7cac47f
 2022-07-14 04:15:03 +00:00
Kuan Wang
3d2e5a2447 Duplicate BatteryChartPreferenceController and BatteryChartView into new 
files for better diff review purpose

Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: I2d29bbfe14bcc5df7c09bceec2cbb0673685f522
 2022-07-14 02:35:55 +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
688fcb583c Merge "Update SFPS Enrollment to have error messages replace title" into tm-qpr-dev am: e287bbe82b am: b04079323c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19264894

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

Change-Id: I6fa2ffc12e93706cea00d39b35e222ef951527c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-13 17:42:41 +00: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
Sorin Basca
61fdd86ec2 Merge "Use Mockito 4.6.1 API" 2022-07-13 14:33:28 +00:00
Chaohui Wang
a493470182 Merge "Clean up unused system nav videos" 2022-07-13 09:35:22 +00:00
Chaohui Wang
d86d25445f Merge "Clean up unused resources" 2022-07-13 08:50:25 +00:00