Commit Graph

18873 Commits

Author SHA1 Message Date
Zaiyue Xue
d71ead4afb Merge "Combine screen on time map into battery usage map" into udc-dev am: cfa374f997 am: 8892fd48ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802758

Change-Id: I20a63b7ebaa4eb61b1dfac97c95096641a5ea176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 04:37:29 +00:00
Zoey Chen
ea0f1b4bc6 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev am: c31cf3d3b4 am: c28a5c3431
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802959

Change-Id: Id57034121f9693355433080ec2567ce18d0ad70f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 04:35:00 +00:00
Zoey Chen
ca01227cbb Merge changes from topic "regional_preference_metrics" into udc-dev am: 1d74998647 am: 609b91c715
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22762358

Change-Id: Ic6853f25c0ac65a0a31114dcd65c0047f0ff0550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 04:33:22 +00:00
Zaiyue Xue
cfa374f997 Merge "Combine screen on time map into battery usage map" into udc-dev 2023-04-25 03:31:39 +00:00
Zoey Chen
c31cf3d3b4 Merge " [Settings] UI part: Add metrics for numbers preferences" into udc-dev 2023-04-25 03:00:20 +00:00
Zoey Chen
1d74998647 Merge changes from topic "regional_preference_metrics" into udc-dev
* changes:
  [Regional Pref] Remove Calendar controller and related Fragement
  [Regional Pref] 1. Add metrics for user changes the First day of week 2. Refactor to Settings design
  [Regional Pref] 1. Add metrics for user changes the Temperature unit 2. Refactor to Settings design
2023-04-25 02:59:27 +00:00
Fangqiu Su
6b6044bedb Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436 am: a176782c18 am: 5ed8e6bc0e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ic9bd09f06a4cf29e220b9516846ead6b0e2e634e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 01:55:20 +00:00
Fangqiu Su
a176782c18 Merge "Update uiautomator references in packages/apps/Settings/tests/unit" am: 233c708436
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2558510

Change-Id: Ifef3769deeed83ef20214e9ade0b2f3f9000ccfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-25 00:27:13 +00:00
Fangqiu Su
828f2fcec9 Update uiautomator references in packages/apps/Settings/tests/unit
* Remove unused dependencies.
* Replace "ub-uiautomator" (v2.2.0) with
  "androidx.test.uiautomator_uiautomator" (v2.3.0).

Bug: 235842600
Test: mmma .
Change-Id: I55c2d77b0bcd3b673de5a0b42170414de5fc3baf
2023-04-24 18:07:07 +00:00
Zoey Chen
10fa1b8aec [Regional Pref] Remove Calendar controller and related Fragement
Bug: 275003276
Bug: 264483854
Change-Id: I2431ea55a7a69db8a4f661a125a6ca218ce41a94
2023-04-24 10:27:10 +00:00
Zoey Chen
4aa05e58bb [Regional Pref] 1. Add metrics for user changes the First day of week 2.
Refactor to Settings design

Bug: 275003276
Bug: 264483854
Change-Id: Ibea987b6e51fd76c89a0ff5269da6e99171f6b1c
2023-04-24 10:26:52 +00:00
Zoey Chen
5d2ce38d3a [Regional Pref] 1. Add metrics for user changes the Temperature unit 2.
Refactor to Settings design

Bug: 275003276
Bug: 264483854
Change-Id: Ib886ace45db8cfd7dd0f468d03a0aa0551f1f5c4
2023-04-24 10:25:44 +00:00
Zoey Chen
af05cf7e0e [Settings] UI part: Add metrics for numbers preferences
Bug: 275003276
Test: local test
Change-Id: I2455252f3ed7f5355a363a79076113bd4452732d
2023-04-24 10:22:03 +00:00
Zaiyue Xue
d92c4fc823 Combine screen on time map into battery usage map
This cl is refactor only. It makes next cl ag/22809776 easy to replace screen
compenent time with screen on time.

Bug: 278022529
Test: manual
Change-Id: I2538aeafb0c697f13ec617cea44a70a1b2a114b0
2023-04-24 14:08:13 +08:00
Chaohui Wang
8397287f87 Fix flicker for Data Usage page
Both "Mobile data usage" & "Non-carrier data usage".

By,
1. Use summary placeholder for usage amount to avoid shift
2. Before fix CycleListener's onItemSelected() is called multiple times,
   cause the app list to flash, let DataUsageList to handle the dedup
   logic to better handling.
3. Before fix if return from App Usage page, no loading view is
   displayed (only first enter has it), move this to onResume() to fix.
4. Before fix the cycles passed to App Usage page is cached (even when
   the cycles are changed), clear the cache when onResume() to fix.
5. Listener in SpinnerPreference could be null, add safety guard to it.

Cherry-pick from Change-Id: I95e544c46333496f4f30ed77dafa4779b4d66019

Fix: 277162513
Test: manual visual test
Test: Unit test
Change-Id: I50fb79aa3c888651a79fd1d030da554bebb6a660
2023-04-22 08:47:22 +08:00
Chaohui Wang
f46b33bbc4 Revert "[DataUsage] Adjusting the control of display sequence"
This reverts commit b8491032d7.

Bug: 277162513
Test: Manual
Test: Unit test
Change-Id: I5a84a9b1a99b1da4c18d786a6dff062b53cd46c6
2023-04-22 08:47:21 +08:00
Philip Junker
134bea1957 Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev 2023-04-21 10:07:47 +00:00
Piotr Wilczyński
85d5e3efb8 Merge "Back up the smooth display setting" into udc-dev 2023-04-21 07:31:47 +00:00
Treehugger Robot
0c1838807d Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev 2023-04-21 05:57:43 +00:00
Zaiyue Xue
74d8a4b745 Fix BatteryChartPreferenceControllerTest Fail
Bug: 279107937
Fix: 279107937
Test: presubmit
Change-Id: Ie5597361e4c3c90737b8dcfc302fc3aad94ea476
2023-04-21 11:12:14 +08:00
Piotr Wilczyński
5c42659602 Back up the smooth display setting
- Convert "Smooth display" and "Force peak refresh rate" to a boolean. If they are a boolean, they can be backed up without being device-specific.
- Back up "Smooth display" and add a validator
- Upgrade the settings in SettingsProvider
- Create a utils class - RefreshRateSettingsUtils

Bug: 211737588
Test: atest DisplayModeDirectorTest
Test: atest ForcePeakRefreshRatePreferenceControllerTest
Test: atest PeakRefreshRatePreferenceControllerTest
Test: atest SettingsBackupTest
Test: atest SettingsProviderTest
Change-Id: Ib2cb2dd100f06f5452083b7606109a486e795a0e
Merged-In: Ib2cb2dd100f06f5452083b7606109a486e795a0e
2023-04-20 13:25:38 +00:00
Treehugger Robot
bc67d885ec Merge "Update the proper App battery usage string on App info page" into udc-dev 2023-04-20 10:50:46 +00:00
ykhung
ff65a02ff8 Update battery tip main icon into materiel theme design
Update all battery tip icon into materiel theme design based on the UX
feedback and clean up legacy icons

Bug: 246960554
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Change-Id: I82f5b140700a36b29844c0c3330b2eeeda8e5a55
2023-04-20 09:19:36 +00:00
TreeHugger Robot
d21225790b Merge "[BiometricsV2] Fix fingerprint add another fail" into udc-dev 2023-04-20 03:34:29 +00:00
Becca Hughes
d8b74b5c39 DO NOT MERGE Live update cred man settings
This CL will enable live update of credential
providers if any are added/removed.

Test: atest
Bug: 264420106
Change-Id: I14804bac17a4efe5eccd3c5824558eace18da186
2023-04-19 22:06:15 +00:00
Philip Junker
ded7f45e6a List apps which requested the TURN_SCREEN_ON appOp permission
This reverts commit 94f08e4ba1.
Reason for revert: Re-land with fix (b/278739832#comment8)

Bug: 272053372
Change-Id: I945e543b6e17b682bc88e9e9b0a79775a71dd6f7
Test: manually installed an app which requests the permission and verified it shows up correctly in Settings > Apps > special app access > Turn screen on
Test: atest AppFilterRegistryTest
Test: atest TurnScreenOnDetailsTest
Test: m -j RunSettingsRoboTests
Test: adb shell am start -a android.settings.TURN_SCREEN_ON_SETTINGS
2023-04-19 11:59:19 +00:00
Milton Wu
3024352f85 [BiometricsV2] Fix fingerprint add another fail
Fix enrolling can't finished because FingerprintEnrollment attaches to
wrong ViewModel during onCreate() with non-null savedInstance after
rotation.

Read latest fragment through findFragmentById to fix it

Bug: 275513362
Test: atest FingerprintEnrollmentActivityTest
Change-Id: Icb2c0edec325a813ec5a7822aba39ca201d2d8e9
2023-04-19 17:35:33 +08:00
Yanting Yang
3be454f967 Update the proper App battery usage string on App info page
Bug: 278045681
Test: visual
Change-Id: I4da671615f11554e2cd64f3a801252df5c0ba6f4
2023-04-19 17:00:46 +08:00
YK Hung
3f9363aaff Merge "Fix banner tip buttons visibility and update incompatible tip" into udc-dev 2023-04-19 07:40:45 +00:00
ykhung
ab07b53ea1 Fix banner tip buttons visibility and update incompatible tip
Fix the battery settings banner tip buttons visibility not reset issue
and update the incompatible charging tip into the colored primary button

Bug: 246960554
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.widget.CardPreferenceTest
Change-Id: I9b72fccc7838d974d3b60d0f9684780841623cbb
2023-04-19 06:24:51 +00:00
Linyu He
e346dc6779 Merge "Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."" into udc-dev 2023-04-18 19:36:45 +00:00
Liana Kazanova
94f08e4ba1 Revert "List apps which requested the TURN_SCREEN_ON appOp permi..."
Revert submission 22338257-turnScreenOnPermission_pregrant

Reason for revert: b/278739832

Reverted changes: /q/submissionid:22338257-turnScreenOnPermission_pregrant

Change-Id: Iada276497c37c0e89a2cde8706394949d468e8e5
2023-04-18 17:47:14 +00:00
Treehugger Robot
dc02736824 Merge "Fallback to "Extended Compatibility" if Speed feature is not ready" into udc-dev 2023-04-18 16:21:11 +00:00
Philip Junker
c57e5c0e2c Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev 2023-04-18 15:36:55 +00:00
Weng Su
d965ff3049 Fallback to "Extended Compatibility" if Speed feature is not ready
- Fallback to the "Extended Compatibility" design when the following conditions occur
  - 5 GHz band is not supported on the device
  - 5 GHz SAP available channels cannot be obtained from WifiManager
  - 6 GHz SAP available channels cannot be obtained from WifiManager

Bug: 272450463
Test: manual test
atest -c WifiTetherSettingsTest
atest -c WifiTetherViewModelTest \
         WifiHotspotRepositoryTest \
         WifiTetherSecurityPreferenceControllerTest.java \
         WifiTetherMaximizeCompatibilityPreferenceControllerTest

Change-Id: If7c8c41ebe86f5e7d8e4737ab7a82d38c9d633de
2023-04-18 20:49:25 +08:00
Philip Junker
58e7b70df3 List apps which requested the TURN_SCREEN_ON appOp permission
Bug: 272053372
Test: manually installed an app which requests the permission and verified it shows up correctly in Settings > Apps > special app access > Turn screen on
Test: atest AppFilterRegistryTest
Test: atest TurnScreenOnDetailsTest
Test: m -j RunSettingsRoboTests
Test: adb shell am start -a android.settings.TURN_SCREEN_ON_SETTINGS
Change-Id: I7c47d4b1c0b33c7ba6209bb64acf93cb07d9a717
2023-04-18 09:12:44 +00:00
Jason Hsu
80016ad92a Merge "Fix pair another dialog doesn't show up after pairing in all bluetooth device page." into udc-dev 2023-04-18 08:47:37 +00:00
Treehugger Robot
2a0d6ead1a Merge "[BiometricsV2] fix enrolling rotate failed" into udc-dev 2023-04-18 04:56:12 +00:00
YK Hung
d9f390010b Merge "Cleanup smart battery entries (1/3)" into udc-dev 2023-04-18 01:59:06 +00:00
Jay Sullivan
4d5ac5a89f Merge "[Safety Labels] Filter out auto, wear and tv" into udc-dev 2023-04-17 19:53:43 +00:00
Becca Hughes
b69351b06d Add dialog for enabling a provider in settings
Test: manual
Bug: 277923170
Merged-In: I404444115f178faf5545dec9686096fcdfdf73de
Change-Id: I404444115f178faf5545dec9686096fcdfdf73de
2023-04-17 18:06:50 +00:00
lbill
e85d588904 Fix Settings crash on non face service support devices
Doing some improvement for stability:

1. Check hasSystemFeature(PackageManager.FEATURE_FACE) for non-face
   service devices.
2. Wrap addAuthenticatorsRegisteredCallback()
3. Find mPreference before addAuthenticatorsRegisteredCallback

Bug: 276680407
Bug: 278174667
Bug: 277647959
Bug: 277725506
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
      FaceSettingsFooterPreferenceControllerTest
Change-Id: I81346b6eb8c44106c5e52867d69c8736203dd558
2023-04-17 11:45:13 +00:00
Wesley Wang
742e506d13 Cleanup smart battery entries (1/3)
- Remove smart battery entry from battery settings page since
   restriction app info already move to app list page and smart battery
   feature will keep as enabled, smart battery page will be empty
 - Enable battery usage list page for AOSP

Bug: 277175992
Test: make SettingsRoboTests
Change-Id: I9221cecbfc8445b8f470975551f600e94e3128d5
2023-04-17 16:50:21 +08:00
Milton Wu
562bbc8193 [BiometricsV2] fix enrolling rotate failed
Clean help message during progress changed, and reload help message from
ViewModel in onStart of enrolling page.

Bug: 275513362
Test: atest FingerprintEnrollProgressViewModelTest
Test: enable biometrics v2, and manully rotate screen when help msg
      is shown, and check help msg is kept after screen rotation.
Change-Id: I44220050806038ee62750f8945b8ba8f8bb9c282
2023-04-17 08:06:53 +00:00
Treehugger Robot
7d3b07f6cb Merge "Customize ChooseLockGeneric SUW options" into udc-dev 2023-04-17 06:59:18 +00:00
Chaohui Wang
a42119c6a8 Merge "Migrate latest changes in "Alarms and Reminders"" into udc-dev 2023-04-15 16:32:54 +00:00
Hao Dong
bba66e54b3 Merge "Count isActivityEmbedded() state to show split screen warning dialog" into udc-dev 2023-04-14 19:04:55 +00:00
Treehugger Robot
9ce2e21857 Merge "Fix rotate device at face unlock detailed page, device will display redundant face unlock header." into udc-dev 2023-04-14 17:11:40 +00:00
jasonwshsu
c8a53a9391 Fix pair another dialog doesn't show up after pairing in all bluetooth device page.
Solution: Finish the page immediately to back to previous page when already BONDED the device in
all bluetooth device page.

Bug: 270096758
Test: make RunSettingsRoboTests ROBOTEST_FILTER=ViewAllBluetoothDevicesPreferenceControllerTest
Change-Id: I13a88c3fbe0c6851f9446a9f574a1c18f934cd2e
2023-04-14 18:25:28 +08:00
lbill
09276c9639 Count isActivityEmbedded() state to show split screen warning dialog
According to Activity#isInMultiWindowMode() API design,
When the Task is in fullscreen windowing mode, and the app is in
ActivityEmbedding split (two activities split left and right),
Activity.isInMultiWindowMode() == true.

With the reason, we should consider additional condidion for
foldable device in unfolded mode, while settings activities
config to embedded activity, we can't only count on
isInMultiWindowMode() for split-screen mode

Bug: 278176550
Bug: 276938441
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul go to split screen mode and try to enroll face
Test: manual unfold device and enroll finger or face
Change-Id: I02bd223f27889e74e67b73051531a5b4554f3de1
2023-04-14 09:57:04 +00:00