Commit Graph

122032 Commits

Author SHA1 Message Date
Treehugger Robot
ad40884cbb Merge "Avoid unnecessary re-creating of Wi-Fi password dialog" into udc-dev am: 5ae083b952 am: 5019020268
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802958

Change-Id: I9060aa1b56c7907214c64c685aec630164910c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 15:19:57 +00:00
Treehugger Robot
5019020268 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: I9f9b26ab62dc1f4b72bc52d712ce3335000ca0fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 14:40:19 +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
Zaiyue Xue
82b1963cde Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e am: 14d7a77554
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802757

Change-Id: Ibedc5584d83fbef63a8836de9e637c928b510319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:34:49 +00:00
Angela Wang
748edb6be6 Logs Flash Notifications toggle event am: 8b1f85aaac am: 693611fa18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949

Change-Id: Iddcec612dccd548899836fd015bf86bbb3e8a4e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:34:39 +00:00
Zaiyue Xue
69f5e991ab Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e am: 3e22025c95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802757

Change-Id: I5db4d3105c29c0870523670ce6232933cf55fa40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:31:24 +00:00
Angela Wang
8651b766d7 Logs Flash Notifications toggle event am: 8b1f85aaac am: 64466c5c3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949

Change-Id: I427c55f2d1d8ad17e318749754e5e3f6abb24386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:30:04 +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
3e22025c95 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: I363378cfdfa7a353f5b3c71dee9933a81d468b47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 07:12:55 +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
64466c5c3d Logs Flash Notifications toggle event am: 8b1f85aaac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949

Change-Id: Ifc9bd5e497ec1ee386bad8eac725a299e90c7b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-24 06:52:42 +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
88b5e80d37 Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791 am: deeb5916f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519

Change-Id: Icb98a7258b718325ad9437e5cf0cb073e45029cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-23 06:30:29 +00:00
Chaohui Wang
ae541c2ebb Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791 am: 80112c15cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519

Change-Id: I091becfc044a1ec8cf5e3cf153a3935688ad052d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-23 06:25:33 +00:00
Chaohui Wang
80112c15cb 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: I3c6edaaeb38ccb7a1a7f13e78450e18625fd77a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-23 05:47:08 +00: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
Xin Li
974f0f3762 [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: eb2cb56f9b -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: If38dfd0871f7cf5717c12806c0f76d580ea0f57f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:14:42 +00:00
Xin Li
fe8a6baae3 [automerger skipped] Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 am: 752715c5ca -s ours am: b27298c4fe -s ours am: ce8657848c -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: I4aa4bbfb486036d7ac61943b48310d49ca89b5dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 23:11:50 +00: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
Jagrut Desai
00906998af Merge "Adding support for calling into SystemNavigationGestureSettings" into udc-dev am: eea8283783
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22773634

Change-Id: I8d8a79246658fd74fef0d536a750bd4cd6ae74f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 16:58:26 +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
a9e09ac0ce Merge "List apps which requested the TURN_SCREEN_ON appOp permission" into udc-dev am: 134bea1957
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22724663

Change-Id: I7edb0846e9d07ad966fdb3753d02481d4b959cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 10:20:25 +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
73b4163534 Merge "Add Null check FingerprintSettings#updateAddPreference()" into udc-dev am: a958fc79c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22668309

Change-Id: I99ec5143d6367180b2a33262b50b07724dbacc6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 08:13:02 +00:00
Piotr Wilczyński
1fc920d0cf [automerger skipped] Merge "Back up the smooth display setting" into udc-dev am: 85d5e3efb8 -s ours
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

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

Change-Id: Id32d9d31e5776e0d88c76ccde881fa337b1ad283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 07:56:31 +00:00
Piotr Wilczyński
157fe7c4b7 [automerger skipped] Back up the smooth display setting am: 5c42659602 -s ours
am skip reason: Merged-In Ib2cb2dd100f06f5452083b7606109a486e795a0e with SHA-1 af320436fb is already in history

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

Change-Id: I7b3e7d7d1d4096680a38656f18e29e2d86e83036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 07:56:28 +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
4334ccb662 Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev am: 0c1838807d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22779517

Change-Id: Ib98306fe33abe1520124309d84c13580e0c57a04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 06:28:02 +00:00
Treehugger Robot
0c1838807d Merge "Fix BatteryChartPreferenceControllerTest Fail" into udc-dev 2023-04-21 05:57:43 +00:00
TreeHugger Robot
e7a1f12ea0 Merge "[Settings] Dialog does not show full msg and title in landscape mode" into udc-dev am: 06a4e06291
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22747102

Change-Id: Iae6ef0f7100dde1b24cffbb2fc447fec14597f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-21 05:05:11 +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
Yuxin Hu
77b9ebf525 Merge "Add permission to use GPU service APIs" into udc-dev am: 76e769cdb0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22638748

Change-Id: I61ce5d1606e66479820abf0a15efc390dba80cae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 21:20:18 +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
Tetiana Meronyk
be328cb743 Merge "Add confirmation dialog when granting/revoking admin privileges." into udc-dev am: 84da171439
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22618756

Change-Id: I9ea8083d6b24522f8771977a15d4e06d3059d204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:15:02 +00:00
Ken Lin
947f9f2553 Merge "Smooth Display description error" into udc-dev am: 24a5a1c824
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22693748

Change-Id: Ia06e9e7f22400e884bd3effdb6995564f2b116df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:12:54 +00:00
Elliot Sisteron
18fd113737 Merge "Launch work profile entries intent in the profile parent." into udc-dev am: 0a506448b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22714062

Change-Id: I937ff5894ffb7f000824044981cedc3b2eb63080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-20 20:12:44 +00:00