PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,348 Commits 1 Branch 0 Tags
a74527da3db0cf672f7e3c76bee70d1cf93b012c
Commit Graph

124348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zaiyue Xue
96a48380bd Merge "Change battery usage screen component name" into udc-dev am: 6ebcbdb27e am: cb1e45b5fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22802757

Change-Id: I2f4b34ee6785a4d44bb9cd315f8cb38b54f82f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 07:30:37 +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
Angela Wang
dad8ac3b73 Logs Flash Notifications toggle event am: 8b1f85aaac am: 774769f420 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949

Change-Id: Id5c967024269f23c04724b9732f805609dec9b7d
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
cb1e45b5fc 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: I5c27b7be02cea142cf239463112fbbc3600492b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 07:12:51 +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
774769f420 Logs Flash Notifications toggle event am: 8b1f85aaac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562949

Change-Id: I283d294ec2974d0280a79d087bd1565c452efa1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-24 06:52:36 +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
Zaiyue Xue
1237a70c96 Replace Screen system component time with device screen on time 
Bug: 278022529
Fix: 278022529
Test: manual
Change-Id: I95a107ea5c3c5e15893c0846c8fd83757e7b9358
 2023-04-24 14:10:51 +08: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
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
Chaohui Wang
3cdad40840 Fix EID dialog related issues 
Fix the following issues,
- After eid dialog dismissed, enter other page and back will trigger
  eid dialog again
- After screen rotation, dialog content disappeared

Fix: 277871671
Test: Manual
Change-Id: Ibd0ffb182cf69ea40e4b3fe0e8e840931d705df6
 2023-04-23 15:49:52 +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
32fefe53e8 Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791 am: deeb5916f9 am: 88b5e80d37 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519

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

Change-Id: I778a451521efdf649fe9ce3f1681390b7b2d05df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-23 06:48:57 +00: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
6e13054555 Merge changes I50fb79aa,I5a84a9b1,Iea61c06d into udc-dev am: 0fa23e9791 am: ab18cb8bcf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22790519

Change-Id: Ie67e1905ca48f5bde13414fad83cb9830af8ef57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-23 06:27:05 +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
ab18cb8bcf 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: Ia6778caaba3325bcd0c06da3190850182858438c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-23 05:47:07 +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
Bill Yi
6c113d0c54 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab 2p: aaa28fb0e7 
Blank merge reason: commit message contains skip directive

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

Change-Id: I032630e40afe781886eb18b9714a38bb65f7ffda
 2023-04-22 14:20:18 +00:00
Bill Yi
aaa28fb0e7 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ca18853bab 
Blank merge reason: commit message contains skip directive

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

Change-Id: I7923220a59923528c5ca01061d950381fb79a823
 2023-04-22 14:16:37 +00:00
Bill Yi
fb7650e88f [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fa5e1c57f8 
Blank merge reason: commit message contains skip directive

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

Change-Id: I5e37aa9c2ef4e07e85487b8b88251841e2b850ca
 2023-04-22 14:10:27 +00:00
Bill Yi
c4649b3ede [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 960fa1521c 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ieba8c736957dfa9378e5f62bef474ce278596ac3
 2023-04-22 14:10:26 +00:00
Bill Yi
4f92177ec1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8bb3a96d150426d63a01488f6e20d43ba0241388
 2023-04-21 20:15:16 -07:00
Bill Yi
d5ac034998 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7d24b57dd0f06b53f62b135dbc3d92b01efd27c8
 2023-04-21 20:13:56 -07:00
Bill Yi
1c43541f1c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7379e50c5abc890323f0ee25431f2a3c363f71a0
 2023-04-21 20:03:55 -07:00
Bill Yi
5457c4b50b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I833dc4787dcceff5026542ea5ed0dfaa06a80291
 2023-04-21 20:01:11 -07:00
Bill Yi
6d4b01e8c9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I52fd610af8f3b68cdaf5e4c7540d37c1891da780
 2023-04-21 19:58:33 -07:00
Bill Yi
1d92367e32 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If7ad9a5450d05a49e86a7ae93cf43ddd0d70c2b4
 2023-04-21 19:56:30 -07: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
ca18853bab Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If34cd71ef08b67f4463d83cd1afd5361bae4b873
 2023-04-21 17:17:53 -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
Bill Yi
fa5e1c57f8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ide3a650caf8d7a7d3a127d31be873d5eb3e067d9
 2023-04-21 17:15:06 -07:00
Bill Yi
960fa1521c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I686b72adb7baa39b1bf41d1a4e112530b0d773c6
 2023-04-21 17:13:18 -07:00
Xin Li
46a75de98a [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: 974f0f3762 -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: Ia4aa546cbb3144ee3ce2088389704260e9fbd37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 23:54:30 +00:00
Xin Li
c98eeb0825 [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: fe8a6baae3 -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: I9bd5a7ff2b9433fbe124cf29bcba8e4ff41998a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 23:52:29 +00: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