Commit Graph

121503 Commits

Author SHA1 Message Date
Bill Yi
f9392111bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: eb6de672dc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d9d0f1a19122f51fcc8cce15cb4c0c0e76fd933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:16:26 +00:00
Bill Yi
19a53a5241 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51a04e12bf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25aaf4e993f96b9247b1efb8bd273a029378d576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:16:18 +00:00
Bill Yi
bcafcba421 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ae1b6f1e35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4c3ace854f36107dbd35398697545dde1bd3152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:16:15 +00:00
Bill Yi
f0911b2572 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71c7b5f54c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I517f2084707e439e43271a2e9f17e0ddc3850b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:16:11 +00:00
Bill Yi
ec6a532d98 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ef269038ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f3ad8a6d69d07f56c8255e14f2f9c6555e2c1e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:15:57 +00:00
Bill Yi
7218d10694 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5c646d4394 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie3a73e2fef1e079f3dca4794a41f45f46e1be4b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 22:15:22 +00:00
Bill Yi
eb6de672dc Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-24 21:58:45 +00:00
Bill Yi
ae1b6f1e35 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-24 21:58:45 +00:00
Bill Yi
ef269038ef Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-04-24 21:58:45 +00:00
Randy Pfohl
a8e19402ab Merge "Ensure we launch gesture tutorial as new task" into udc-dev am: a4e868af0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22788321

Change-Id: Icdc5a9074af0a09d5b0a5a366761e1eb37d27a61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 18:28:31 +00:00
Randy Pfohl
a4e868af0d Merge "Ensure we launch gesture tutorial as new task" into udc-dev 2023-04-24 18:16:08 +00:00
Treehugger Robot
76a0dae43b Merge "[Regional Preference] Do not get child fragment if the fragment is not added" into udc-dev am: d6fb2c45dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22789043

Change-Id: Iff5950f22dd26f07a5a2d8c89796dbe062ececc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 16:53:31 +00:00
Treehugger Robot
d6fb2c45dc Merge "[Regional Preference] Do not get child fragment if the fragment is not added" into udc-dev 2023-04-24 15:54:35 +00:00
Treehugger Robot
bd928079ff Merge "Avoid unnecessary re-creating of Wi-Fi password dialog" into udc-dev am: 5ae083b952
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802958

Change-Id: Id6ffcfc44c0a7507b6a24f0dc7c2e2a57f5ea52b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 14:31:03 +00:00
Treehugger Robot
5ae083b952 Merge "Avoid unnecessary re-creating of Wi-Fi password dialog" into udc-dev 2023-04-24 14:07:52 +00:00
Zoey Chen
cec01e38ef [Regional Preference] Do not get child fragment if the fragment is not
added

Bug: 279376395
Test: local test
Change-Id: I352597dedf2ba7770936d44d09aa111762f94502
2023-04-24 12:38:43 +00:00
Zaiyue Xue
14d7a77554 Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802757

Change-Id: I9fdd7b5c9cc07d905ffe76ab3774b31d4fb309d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:29:57 +00:00
Zaiyue Xue
6ebcbdb27e Merge "Change battery usage screen component name" into udc-dev 2023-04-24 06:59:21 +00:00
Angela Wang
693611fa18 Logs Flash Notifications toggle event am: 8b1f85aaac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949

Change-Id: I6c7420d98ab8ad0e440151297f8f28704ca4fb18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 06:48:25 +00:00
Angela Wang
8b1f85aaac Logs Flash Notifications toggle event
Logs the toggle event of different kind of flash notification to better know about how many usage of these feature and make it as our success metrics.

Bug: 277552681
Test: m statsd_testdrive && statsd_testdrive 513, checks the metrics manually
Change-Id: I73068744b7eef391ee459314da21c23cf64ef212
2023-04-24 06:12:23 +00:00
Weng Su
179fc5e1f1 Avoid unnecessary re-creating of Wi-Fi password dialog
- The Wi-Fi password dialog will be re-created on larger devices, this behavior is unnecessary.

- Modify AndroidManifest to avoid WifiDialogActivity re-creating.

Bug: 259986151
Test: manual test on the device

Change-Id: I394b5ff6d1e0f51c4b2aec270541ce04d6ace9a4
2023-04-24 13:50:09 +08:00
Zaiyue Xue
ca8e34e073 Change battery usage screen component name
Bug: 278022529
Test: manual
Change-Id: Ief9c2d83d1eae06047d64578886c0e1572bdcf0d
2023-04-23 15:42:22 +08:00
Chaohui Wang
deeb5916f9 Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519

Change-Id: Id3722ad9a28e07c967c8d7e49f5145ba346db567
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-23 05:42:59 +00:00
Chaohui Wang
0fa23e9791 Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev
* changes:
  Fix flicker for Data Usage page
  Revert "[DataUsage] Adjusting the control of display sequence"
  Revert "[Settings] Adjusting the control of display sequence (part 2)"
2023-04-23 05:14:01 +00: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
Chaohui Wang
52b723beef Revert "[Settings] Adjusting the control of display sequence (part 2)"
This reverts commit 6b379cd7cf.

Bug: 277162513
Test: Manual
Change-Id: Iea61c06d328626a96c13c4c9f8a11f8329401b35
2023-04-22 08:47:20 +08:00
Bill Yi
51a04e12bf Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I627c552f8da0bc57708bffa767acfdb1f4fe9e12
2023-04-21 17:25:02 -07:00
Bill Yi
71c7b5f54c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I747a6dd6b0d5c4b2d23e7334887745ec86c51c11
2023-04-21 17:19:35 -07:00
Bill Yi
5c646d4394 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I127281eb9e0cd43de528e58fe5db67ae55fe10b1
2023-04-21 17:16:56 -07:00
Xin Li
eb2cb56f9b [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c -s ours am: 57c5a99b9f -s ours
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: I4127df037d90c6b9ac4c9a63a7cc02ff967abf3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:36:27 +00:00
Xin Li
ce8657848c [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca -s ours am: b27298c4fe -s ours
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: I28a18e0f9c9d0f394026476f10b620286a877786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 22:34:06 +00:00
Xin Li
57c5a99b9f [automerger skipped] Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master am: f64573ee7c -s ours
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: Ica592b8926aca252eb1384319bd886b633ac185f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:18:31 +00:00
Xin Li
b27298c4fe [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca -s ours
am skip reason: Merged-In I07d10fb2cb1cb267bc78b0be2c930d7dec9d9c76 with SHA-1 a568dc677b is already in history

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

Change-Id: I384b965aecd6723b49042933cd1116365da09f57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 18:15:13 +00:00
Xin Li
f64573ee7c Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:03 +00:00
Randy Pfohl
f572cc569e Ensure we launch gesture tutorial as new task
test: built for two pane device and verified it opens full screen
bug: 278918583
Change-Id: Icee33cb4a931e3037eab8e0146eddca55a5fd09d
2023-04-21 16:53:04 +00:00
Jagrut Desai
eea8283783 Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev 2023-04-21 16:16:31 +00: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
Bill Lin
a958fc79c8 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev 2023-04-21 07:35:55 +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
TreeHugger Robot
06a4e06291 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev 2023-04-21 04:28:19 +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
lbill
8e12f5257d Add Null check FingerprintSettings#updateAddPreference()
When fingerprint finish enrollment, user click Done
The flow would be:
-> wm_finish_activity
-> relaunch_resume_activity
-> wm_on_destroy_called
-> wm_on_create_called
-> wm_on_start_called
-> wm_on_activity_result_called
   In U, we need to add NPE check when updateAddPreference()
   earlier then addFingerprintItemPreferences()
-> wm_on_resume_called

Bug: 275519315
Test: manual enroll SFPS, in FingerprintEnrollEnrolling,
      rotate device, then complete the enrollment
      verify the flow never crash and user can see enrolled
      fingerprint in FingerprintSettings

Change-Id: Ia262741aeceeb36eefd159ad2ca1c9fa0e061d54
2023-04-21 02:24:43 +00:00
Jagrut Desai
c36081b833 Adding support for calling into SystemNavigationGestureSettings
For taskbar pinning feasture we need to link user to navigation mode system settings,
this CL will create
- New NavigationModeSettingsActivity
- Intent Filter to invoke SystemNavigationGestureSettings

Test: Manual
Bug: 279069606
Flag: not needed
Change-Id: I55b47d158d18bcb075329f795f15b2e6fc2ea810
2023-04-20 13:55:47 -07:00
Yuxin Hu
76e769cdb0 Merge "Add permission to use GPU service APIs" into udc-dev 2023-04-20 18:05:47 +00:00
Tetiana Meronyk
84da171439 Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev 2023-04-20 15:12:57 +00:00
Ken Lin
24a5a1c824 Merge "Smooth Display description error" into udc-dev 2023-04-20 14:00:53 +00: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
Elliot Sisteron
0a506448b8 Merge "Launch work profile entries intent in the profile parent." into udc-dev 2023-04-20 12:19:33 +00:00