PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,234 Commits 1 Branch 0 Tags
941cae99a58871e827d6639b35d52a9f78879d3c
Commit Graph

118234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
941cae99a5 Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d am: ee773103f8 am: cd486c06d0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743

Change-Id: Icca73d74b5ee6c32607761c8f3c45ab565419604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 14:07:17 +00:00
Automerger Merge Worker
d6f76e0081 [automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: b54c768b90 -s ours am: 99c0b8baf6 -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: I973016f96d28794d7241931f72730c27baf36b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 13:50:04 +00:00
Xin Li
ccca1eba6c [automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32 -s ours am: 06b6887d64 -s ours am: bd7e05c797 -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: Ie5d8c08699d628d10922fe9f793d2ab5e039ed1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 13:47:40 +00:00
Bonian Chen
b7480f6713 Merge "[Settings] Add QR code for EID and enable text copy" 2022-12-12 12:50:51 +00:00
Bonian Chen
6a383db74b [Settings] Add QR code for EID and enable text copy 
1. Add QR code for EID (when available)
2. Enable text copy

Bug: 260540995
Test: local
Change-Id: Iba7eace2ca3142a065219a3e65371af52df1511c
 2022-12-12 12:50:28 +00:00
Xin Li
7d0f2b7e96 [automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32 -s ours am: ef13057b38 -s ours am: f63f3c682d -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: Icd0ac12c0b8c0d4a934d87ab05c06961a86d5944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 11:59:13 +00:00
Xin Li
bd9ff743c4 [automerger skipped] Merge Android 13 QPR1 am: ea401a8bba -s ours am: 61084112c8 -s ours am: 862a28bbfe -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: Icf7339d01484896e422f1cec48631973a7f03b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 11:56:46 +00:00
TreeHugger Robot
ecb674742b Merge "Don't hide 1% battery usage apps but show percentage "-" instead." 2022-12-12 08:49:22 +00:00
PETER LIANG
97b7731f04 Merge "Fix the summary of Magnification didn’t be updated after the content change." 2022-12-12 07:47:49 +00:00
Zaiyue Xue
1bf57958d2 Don't hide 1% battery usage apps but show percentage "-" instead. 
Bug b/242252864 will be fixed at the same time.

screen_record: https://drive.google.com/open?id=1ycEuazqQZzNWGO8E2Fh3GdgyTEd2Z9s0&authuser=0&resourcekey=0-x9BJJE6932jIv9fFoecjeQ&usp=drive_link

Bug: 262187603
Bug: 242252864
Fix: 262187603
Fix: 242252864
Test: manual
Change-Id: Id1a8b5291d66a38fb86f168d3115ae566e6ec079
 2022-12-12 14:40:56 +08:00
PETER LIANG
523f9c17b6 Merge "Fix the state didn't reset after the size change and rotation." 2022-12-12 06:29:50 +00:00
Peter Liang
3ef603e622 Fix the state didn't reset after the size change and rotation. 
Action:
Immediately take the effect of updating the progress to avoid waiting for receiving the event to delay update.

Bug: 244979646
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PreviewSizeSeekBarControllerTest
Change-Id: I6b78555c8536b666a3f015e41574c65e15879d1d
 2022-12-12 10:47:53 +08:00
PETER LIANG
5c7997be5e Merge "Refine the UI of the text reading page across SuW." 2022-12-12 02:42:53 +00:00
PETER LIANG
76c59eb0be Merge "Fix the summary of Color inversion or correction didn’t be updated after the content change." 2022-12-12 02:29:45 +00:00
Peter Liang
5e931b2c23 Refine the UI of the text reading page across SuW. 
Actions:
1) Customize pages and use the components from SuW lib to align SuW consistent style.
2) Add the done button in the Anything Else page.

Bug: 232771631
Bug: 222419452
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingResetControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreferenceFragmentForSetupWizardTest
Change-Id: Ie3f3513ceee7c40d6286335dce91979df0d27f02
 2022-12-11 22:11:02 +08:00
Weng Su
cd486c06d0 Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d am: ee773103f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743

Change-Id: I3538fe496c4a5fd5e34d6cb066a8aaab132c2967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 09:16:22 +00:00
Weng Su
ee773103f8 Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743

Change-Id: I6b1d18248dc3026bda0e02e1d43fc350f1e9a680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 08:44:09 +00:00
Weng Su
956f288d1d Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" 2022-12-10 08:11:40 +00:00
Zaiyue Xue
f24fd94b74 Merge "[Battery usage U] Create a flag to guard battery usage features" 2022-12-10 06:07:05 +00:00
Bonian Chen
d40d24d3b6 Merge "[Settings] Support search of each Sim slot status within about phone" 2022-12-10 05:31:25 +00:00
Bill Yi
1e423e1102 Merge changes from topic "tc_change_22120813_18" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2626acac3d
  Import translations. DO NOT MERGE ANYWHERE
 2022-12-10 04:36:40 +00:00
TreeHugger Robot
2c2a826c3f Merge "Explain why keywords_memtag is not translatable." 2022-12-10 02:16:23 +00:00
Automerger Merge Worker
99c0b8baf6 Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: b54c768b90 -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: I8a220494d03397eab1e2076c27ee15ab8a96c99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 01:59:33 +00:00
Xin Li
bd7e05c797 [automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32 -s ours am: 06b6887d64 -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: I3d36ea91eb5b79ce1a62d2a4b7ca0d8c2ec6b293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 01:57:13 +00:00
Xin Li
f63f3c682d [automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32 -s ours am: ef13057b38 -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: Ic3dcfca9dfd8b0507f02b46c0396fd7134c76875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 00:26:58 +00:00
Xin Li
862a28bbfe [automerger skipped] Merge Android 13 QPR1 am: ea401a8bba -s ours am: 61084112c8 -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: I8b47aa9d46c1f9abe02ac9df009921564231c6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 00:24:34 +00:00
TreeHugger Robot
aa156582ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d4d011a97b -s ours am: e33c25fdfb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I20c171a1090e2d7df4aa23fa9c40eb71b23d77d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 00:16:44 +00:00
Bill Yi
add5d48bb9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afd2a8e009 -s ours am: e7a29cb4de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0eb816e31baa992f30891741a72e11987474979e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 00:16:19 +00:00
TreeHugger Robot
e33c25fdfb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d4d011a97b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2cd665e51597b3175ca4f463234c60d547c0fdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 23:44:43 +00:00
Bill Yi
e7a29cb4de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afd2a8e009 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I32f4f86b3c67f0f70090a60988493305b65565e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 23:44:07 +00:00
Automerger Merge Worker
b54c768b90 Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master 
* changes:
  [automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32 -s ours
  [automerger skipped] Merge Android 13 QPR1 am: ea401a8bba -s ours
 2022-12-09 23:29:46 +00:00
Xin Li
06b6887d64 [automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32 -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: I56c03228186562c1b182f5b3469c41258049a90c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 23:21:33 +00:00
Xin Li
48787cbef6 [automerger skipped] Merge Android 13 QPR1 am: ea401a8bba -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: I806f6b7b5dc3924cc7bde0cf069564f16c93d6fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 23:19:11 +00:00
TreeHugger Robot
d4d011a97b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-12-09 23:17:52 +00:00
Xin Li
ef13057b38 [automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32 -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: I75ef121f1fa751c5b8c5dac57fb170c6549a4645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 23:16:54 +00:00
Xin Li
61084112c8 [automerger skipped] Merge Android 13 QPR1 am: ea401a8bba -s ours 
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb is already in history

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

Change-Id: I13c20e6b2f1928b1883496a3a50d799773f00bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 23:14:27 +00:00
Xin Li
b6df569c32 Merge "Merge Android 13 QPR1" 2022-12-09 21:51:11 +00:00
Darrell Shi
139cc47747 Merge "Update screensaver preference summary when on." 2022-12-09 21:16:35 +00:00
Xin Li
ea401a8bba Merge Android 13 QPR1 
Bug: 261731544
Merged-In: I937a4acf0917a16660ff237d0511a5883864a1b9
Change-Id: Iec2afb26733df72a2a8bf46566ffc8a7730069eb
 2022-12-09 10:30:19 -08:00
Darrell Shi
adb864a784 Update screensaver preference summary when on. 
The summary for screensaver preference is updated to, e.g. "On / Art
gallery".

Bug: 261907383
Test: 'make -j64 RunSettingsRoboTests \
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"'

Change-Id: I40483f266c42a6e49e513208ba513d469d67f85a
 2022-12-09 17:33:47 +00:00
Zoey Chen
9ca3255c2d [Settings] Fix crash and UI error when turn ON/OFF SIM 
1. Should update the UI when turn off SIM
2. Fix ConcurrentModificationException

Bug: 259487637
Test: manual
Change-Id: If30a6b6323ac0237c92dc210bf3953ce86a199ae
 2022-12-09 15:04:59 +00:00
Rupesh Bansal
9d0a16aab3 Merge "Remove VR features from apps" 2022-12-09 13:35:14 +00:00
Peter Liang
c0f4e11076 Fix the summary of Color inversion or correction didn’t be updated after the content change. 
Action:
Observe the settings content change and then update the corresponding preference state.

Bug: 245441772
Test: manual test
Change-Id: I6205c2ebe0d1eda141e9b3bd00e4a21dfdba1760
 2022-12-09 20:42:47 +08:00
Bonian Chen
8138e44fde [Settings] Support search of each Sim slot status within about phone 
Support searching of each SIM slot status within about phone page.

Bug: 260540995
Test: auto and local
Change-Id: If905fc595af566665fb1077a5ce11a967f7487aa
 2022-12-09 09:26:11 +00:00
Bonian Chen
13cb087774 Merge "[Settings] Code refactor for device without SIM" 2022-12-09 09:25:17 +00:00
Zaiyue Xue
fa90a4b311 [Battery usage U] Create a flag to guard battery usage features 
Bug: 261800937
Fix: 261800937
Test: manual
Change-Id: I891c235228c9ca0709471b496e6f75167fd0a126
 2022-12-09 15:15:34 +08:00
TreeHugger Robot
160dacf9ad [automerger skipped] Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev am: 47d87cb48d am: 2bd5b1c75f -s ours 
am skip reason: Merged-In I8848ccd1cb0589284a48ddaa77591f5bf3b41932 with SHA-1 a88c064842 is already in history

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

Change-Id: Ib7912f1ef2d076d120abe5f1d135019a64851654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 06:18:31 +00:00
TreeHugger Robot
2bd5b1c75f Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev am: 47d87cb48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20666966

Change-Id: I745c07401d1130ad320c476928f21d68c388f600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 05:55:31 +00:00
TreeHugger Robot
47d87cb48d Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev 2022-12-09 05:26:26 +00:00
Bonian Chen
ca5ef817ff Merge "[Settings] Code refactor" 2022-12-09 05:23:55 +00:00