Commit Graph

113334 Commits

Author SHA1 Message Date
Bill Yi
1c0e84757d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2406d1b52d61ddf1fcc9c52591719d43f1b1cb90
2022-07-14 13:19:37 -07:00
Bill Yi
cc75b57a54 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I33596267597664aec4d58c3b7abbcdfd578e7bcc
2022-07-14 13:15:07 -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
Bill Yi
415f1b8706 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icdb743843e5eeee000e53ea68ae48f5cbff3da14
2022-07-14 01:20:34 -07:00
Bill Yi
3f841a2af4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibfecfad7ee6ee8cc86fefe7107d8e78bbbf40372
2022-07-14 01:17:02 -07: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
Jason Hsu
1059b2d3c4 Merge "Fix test case fail in HearingAidUtilsTest" 2022-07-13 07:40:18 +00:00
Chaohui Wang
ad57478fbc Clean up unused system nav videos
And their preview images.

The usage is removed in
Change Ie56057713d528398a2e3ddad5580c6de2f60bd3f

Bug: 234570979
Test: make Settings App and check System navigation page
Change-Id: Ie30b48883a0559651c62cd923b1bf70d99695080
2022-07-13 14:11:31 +08:00
Sorin Basca
c1c3a84fdc Use Mockito 4.6.1 API
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
2022-07-13 06:39:26 +01:00
Jason Hsu
20f06012f6 Merge changes Ib9cb9b6d,I85209170
* changes:
  Change updatePreferenceOrder() to onCreateView()
  Migrate to DashboardFragment in ToggleFeaturePreferenceFragment
2022-07-13 04:32:22 +00:00
jasonwshsu
86c95fc7ab Fix test case fail in HearingAidUtilsTest
Root Cause: Only happen when running `make RunSettingsRoboTests` not
happen when running `make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest`. It is dependency test case fail when other tests also have AlertDialog pop up alerady.

Solution: Move ShadowAlertDialog reset before running each test, not after running each test.

Bug: 238829557
Test: make RunSettingsRoboTests
Change-Id: I32da4ee87580b4f475556905f7574b211a69b29b
2022-07-13 12:30:01 +08:00
Chaohui Wang
57df989bbf Clean up unused resources
Bug: 234570979
Test: presubmit
Change-Id: I1b683c3eb50b76577cf62c8a7e119e2f1eefe4ee
2022-07-13 11:02:10 +08: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
Menghan Li
ae9d768549 Merge "Add SearchIndexable to improve search coverage" 2022-07-12 22:52:12 +00:00
TreeHugger Robot
60fb901f24 [automerger skipped] Merge "Add function getBatteryHistorySinceLastFullCharge, used to replace getBatteryHistory in BatteryHistoryLoader." into tm-qpr-dev am: 51d087cd67 am: 005876ae80 -s ours
am skip reason: Merged-In I3e3cdd3a0225228bf76f6750f6a56f031666720f with SHA-1 315c78b8e2 is already in history

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

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

Change-Id: Ib9c678e1bcb7dcc562301a1f039f20eb7d3caccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 17:22:43 +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
jasonwshsu
15c73a5f83 Change updatePreferenceOrder() to onCreateView()
Root Cause: change preferences' order in onViewCreated() will see the
order moving animation.

Solution:
* Move to onCreateView() can avoid seeing the order moving animation.
* Move onProcessArguments() to onCreate() to let it be called as early
  as possible. Also let it align the calling getArguments() behavior in
  parent class PreferenceFragmentCompat.

Bug: 171272809
Test: make RunSettingsRoboTests ROBOTEST_FILTLTER=ToggleFeaturePreferenceFragmentTest
Change-Id: Ib9cb9b6df232ddcb681683ac2fcd2c6406c7a487
2022-07-13 00:41:00 +08:00
jasonwshsu
8145631ab8 Migrate to DashboardFragment in ToggleFeaturePreferenceFragment
Root Cause: ToggleFeaturePrefreferenceFragment becomes heavy when more and more features come in.

Solution: Mirgrate to DashboardFragment, a plugin-style preference controllers, can help us separate the preference and its logic into its own controller.

* This is the first step for the whole migration. Change to extend DashboardFragment and fill up the missing override functions.
* Reorder fields and functions to the recommended general approach.

Bug: 171272809
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.accessibility

Change-Id: I852091700a4b3b3c7bbdbc82f0b5dc47c087d61c
2022-07-13 00:40:55 +08: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
Menghan Li
c825a0bdc9 Merge "Remove obsoleted code: DividerAllowedBelowPreference" 2022-07-12 13:01:50 +00:00
Simon Wingrove
f2b0cedcd0 Distinguish multiple PendingIntents via requestCode
Settings uses a system of intent extras to open subsettings pages. When
PendingIntents are created from these Intents, the system does not think
they are unique as extras are not included in this equality check. So
only one of them is likely to work.

A unique request code can be used to distinguish between them.

Bug: 238605613
Test: atest LockScreenSafetySourceTest
Change-Id: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
2022-07-12 09:55:59 +00:00
wesleycwwang
3326e6a66b Add dock charging state into stay awake feature (1/2)
Bug: 233704731
Test: make RunSettingsRoboTests
Change-Id: I48e5279f24f7252c6bf7433a598df796942ed756
2022-07-12 07:01:26 +00:00