Commit Graph

118254 Commits

Author SHA1 Message Date
Chaohui Wang
3199d66b93 Merge "Add spa flag for Picture-in-picture App List" 2022-12-13 10:46:00 +00:00
Zoey Chen
ef2652887a Merge "[Settings] eSIM transfer: MobileNetworkListFragment" 2022-12-13 09:19:37 +00:00
Chaohui Wang
9f735ab6ed Add spa flag for Picture-in-picture App List
Bug: 235727273
Test: Manually with Settings for both flag on and off
Change-Id: I8d907a658406684998bc8b84c214462cb86fed88
2022-12-13 16:30:19 +08:00
TreeHugger Robot
902911f3b5 Merge "Remove logging for count of shown / hidden apps in Battery Usage page." 2022-12-13 07:51:37 +00:00
PETER LIANG
ff861d54d4 Merge "Fix the preview couldn't be scrolled up and down when showing the scroll bar." 2022-12-13 05:50:51 +00:00
TreeHugger Robot
beee3044d8 Merge "Implement new keyboard settings UI." 2022-12-13 05:28:07 +00:00
Zaiyue Xue
4ee99b0e05 Remove logging for count of shown / hidden apps in Battery Usage page.
Bug: 262187603
Fix: 262187603
Test: presubmit
Change-Id: Iff3bcb07f6df424c7498f128739743210d8e7951
2022-12-13 13:17:56 +08:00
danielwbhuang
1639782df6 Implement new keyboard settings UI.
Add enabled input method locales page
Add keyboard layout picker page
Add keyboard settings entry in BT device detail

Bug: 242680718
Test: local test
Change-Id: I07e068ecde553d394697b25cb573f806229f6f52
2022-12-13 10:47:07 +08:00
Arc Wang
d115638c36 Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev am: a0e5f09d94 am: a538747a6a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20615154

Change-Id: Id0b95aa046f8b225d75bedd0ff752f8f1b0b78d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 02:45:16 +00:00
Arc Wang
a538747a6a Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev am: a0e5f09d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20615154

Change-Id: I7acafe30f3cccfb2cf1428493f5cee42c5e8e9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 02:07:35 +00:00
Arc Wang
a0e5f09d94 Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev 2022-12-13 01:19:06 +00:00
Diya Bera
19856fc03c Merge "Flicker in Fingerprint Enrollment" 2022-12-12 20:57:26 +00:00
Diya Bera
37858ea1f2 Flicker in Fingerprint Enrollment
Fixes: 259707991
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=MessageDisplayControllerTest
Change-Id: I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23
2022-12-12 18:16:42 +00:00
Darrell Shi
5fe30a5d97 [automerger skipped] Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625a6 am: ef4fb09916 -s ours
am skip reason: Merged-In I40483f266c42a6e49e513208ba513d469d67f85a with SHA-1 adb864a784 is already in history

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

Change-Id: I5c94ad466e8a510c5daad6b18ec99a69af375357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 17:37:22 +00:00
Darrell Shi
ef4fb09916 Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683706

Change-Id: Ie01d33707536f511f144d82fc13b2d02f2825941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-12 17:01:34 +00:00
Darrell Shi
7bae5625a6 Merge "Update screensaver preference summary when on." into tm-qpr-dev 2022-12-12 16:41:38 +00:00
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
Peter Liang
edfed449c3 Fix the preview couldn't be scrolled up and down when showing the scroll bar.
Actions:
1) Add the specific attribute to disallow parent view intercept the touch event of child view to avoid conflicting with the nested scroll view.
2) Add the scroll view into the page of the mail content preview.

Bug: 220078816
Test: manual test
Change-Id: I7f3b2afdf76e501386d9080e7a0eed8b92e28d3b
2022-12-12 19:32:52 +08: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
Zoey Chen
f1d040a0e4 [Settings] eSIM transfer: MobileNetworkListFragment
- Remove the eSIM/pSIM category and separators
 - Add pSIM/eSIM icon for SIMs

Screenshot: https://hsv.googleplex.com/5263071317590016

Bug: 261810065
Test: atest NetworkProviderSimListControllerTest
Change-Id: If4b8659c377698e682093e1508699bfc96855b29
2022-12-10 09:34:20 +00: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