Commit Graph

121910 Commits

Author SHA1 Message Date
Betty Chang
5e28e6bb1b [automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 am: 1de44c2447 am: 0fd1625895 -s ours am: 9a40a296cc -s ours am: ee536e004c -s ours
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba is already in history

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

Change-Id: I79e817d920b3e8dce819d5915e8a3803c8c96798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:03:01 +00:00
Zoey Chen
e63da6c418 Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev am: ce77de4240 am: 4a3d0d7f8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22142522

Change-Id: I7b697c270a8157015b0933760fdbbd7e025400c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:02:20 +00:00
Bill Yi
e3813079a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 77b98813c3 -s ours am: 239e6fb371 -s ours am: fced4027ab -s ours am: 6bafbe2c33 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3a9af5ccdac3d1c84640b7f12ee545e87d21511
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 22:20:24 +00:00
Bill Yi
2b425d9936 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b -s ours am: 11970fc875 -s ours am: da6f0e89d3 -s ours am: 7d57d8a077 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I29cd29bccb8ac0eb4c20d6040589cfcfb727f3cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 22:20:17 +00:00
Bill Yi
9383dc0a7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 5f0516e69b -s ours am: fe39800ae9 -s ours am: c0fb545e05 -s ours am: 2099dc730e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I686d76fac25083181181b3c2f69325d7b990ae4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 22:20:10 +00:00
Bill Yi
d5fdaa490d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452 -s ours am: d4b4e93227 -s ours am: 28d89441e8 -s ours am: 9f2fdb71c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1ee6a0e335bc92080dd3e39da766d8211e28e278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 22:19:35 +00:00
Kweku Adams
b4240202a2 Merge "Remove RESTRICTED bucket off code." into udc-dev am: f0c3812123
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22075586

Change-Id: Ia744ebcc0d85494ab0febe288100f2fcc3a05be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 16:56:31 +00:00
Kweku Adams
8b735f191b Merge "Remove RESTRICTED bucket off code." into udc-dev am: f0c3812123
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22075586

Change-Id: Ibc396c6fe897fff8bb77c1215f61e5b9cade51a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 16:55:53 +00:00
Chaohui Wang
989a724787 Merge "Fix not displaying "Allow restricted settings"" into udc-dev am: ac67b77af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135265

Change-Id: I7b281c53b97a79eefe16b6716f6e64f5d1f46c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 16:43:43 +00:00
Chaohui Wang
37e0f3fc17 Merge "Fix not displaying "Allow restricted settings"" into udc-dev am: ac67b77af7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135265

Change-Id: I966c86b96402de9dfea45586d884578d0e8f0cf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 16:43:42 +00:00
Becca Hughes
241b14fd9b Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911122

Change-Id: I43db1cde7fc891ac9b1496d2d5b88bd5c044bb80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 16:31:22 +00:00
Becca Hughes
79fb783267 Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21911122

Change-Id: I4e347fbe4bc5fdebf1d4a33230e299daa0d1c3a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 16:30:52 +00:00
Kweku Adams
f0c3812123 Merge "Remove RESTRICTED bucket off code." into udc-dev 2023-03-20 16:13:49 +00:00
Chaohui Wang
ac67b77af7 Merge "Fix not displaying "Allow restricted settings"" into udc-dev 2023-03-20 16:03:47 +00:00
Becca Hughes
853c4a8683 Merge "Add subtitle to settings (settings)" into udc-dev 2023-03-20 16:01:08 +00:00
Zoey Chen
3feb199021 Merge changes I26c7d64e,I7ec6d824 into udc-dev am: 1c47f309af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22120466

Change-Id: Ic4e39b48cf6bc47c6d7b1cef5166b68505e090df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 15:10:35 +00:00
Zoey Chen
36df8ad640 Merge changes I26c7d64e,I7ec6d824 into udc-dev am: 1c47f309af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22120466

Change-Id: I819946d6d420cb23f537a073dfb8f2eb60b222dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 15:10:28 +00:00
Julia Reynolds
78dbfb94aa Merge "Add missing conversation field" into udc-dev am: 2494fd0187
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22118257

Change-Id: Ic759afca2df0e760b699ef237beb18cc06df69a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 15:10:21 +00:00
Julia Reynolds
f448aec29d Merge "Add missing conversation field" into udc-dev am: 2494fd0187
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22118257

Change-Id: I3fdd62e92426653320aa8c492130d9be41f604b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 15:09:18 +00:00
Zoey Chen
1c47f309af Merge changes I26c7d64e,I7ec6d824 into udc-dev
* changes:
  [Settings] update the db list when back to UI
  [Settings] Fix the inconsistent data/entity when switch the app/fragment
2023-03-20 14:53:54 +00:00
Julia Reynolds
2494fd0187 Merge "Add missing conversation field" into udc-dev 2023-03-20 14:28:41 +00:00
jasonwshsu
6c3805288b Update to use android:summary="%s" in ListPreference
* No need to call updateState() in onPreferenceChange()

Bug: 274326713
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(AccessibilityButtonGesturePreferenceControllerTest|CaptioningLocalePreferenceControllerTest|CaptioningFontSizeControllerTest|CaptioningTypefaceControllerTest|AccessibilityButtonLocationPreferenceControllerTest|FloatingMenuSizePreferenceControllerTest|SelectLongPressTimeoutPreferenceControllerTest)"
Change-Id: I14a87597a44c5500ff7e676664b67feb9c352494
2023-03-20 21:24:02 +08:00
Julia Reynolds
5164149efc Add missing conversation field
NotificationChannel#EDIT_CONVERSATION should show
both 'demote conversation' and 'promote conversation'
fields.

Test: View Partial and Full Settings for promoted and
demoted channels
Fixes: 273508155

Change-Id: I4a17a73d695d7c79837fc647b79968f535fa4393
2023-03-20 13:04:11 +00:00
Chaohui Wang
90983daa41 Fix not displaying "Allow restricted settings"
"Allow restricted settings" is missed from SPA, added to SPA to fix this
issue.

Also make the system call in app info more options async to improve
performance.

Fix: 273678047
Test: Unit test
Test: By the following steps,
1. Install an app with accessibility feature from Chrome
2. Go Accessibility page and click on the disabled grey app
3. Go to the app info page, click more options
4. Make sure "Allow restricted settings" is displayed

Change-Id: I4adbe2335a32e6a7c4ebe155715684d768e5d1ef
2023-03-20 19:40:06 +08:00
Betty Chang
226ba1bfc1 [automerger skipped] Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952 am: 00a7d0788f am: aa7ec2d5fe -s ours am: 8170de078c -s ours
am skip reason: Merged-In Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2 with SHA-1 74dc069d16 is already in history

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

Change-Id: I89ead8dee737c81f39c638054f8de66aec4689a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 11:26:24 +00:00
Betty Chang
79932802dc [automerger skipped] Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952 am: 00a7d0788f am: aa7ec2d5fe -s ours am: 8170de078c -s ours
am skip reason: Merged-In Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2 with SHA-1 74dc069d16 is already in history

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

Change-Id: I25ba7dbd89cf9c9d81993fa6fb1ae8117b520737
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 11:25:20 +00:00
Betty Chang
8170de078c [automerger skipped] Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952 am: 00a7d0788f am: aa7ec2d5fe -s ours
am skip reason: Merged-In Ia252f29ad9dfdc09266e91cc9ecaa32ed8c749c2 with SHA-1 74dc069d16 is already in history

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

Change-Id: Ibda82b86ecec145866e0267b689841f53292ba25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 11:12:57 +00:00
Zoey Chen
08eea0993e Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev am: 7a492b4098
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135681

Change-Id: I81549c19fffa32e95b506bf5d6df8166800db21c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 11:04:39 +00:00
Zoey Chen
3066760ea9 Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev am: 7a492b4098
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135681

Change-Id: I39c3301843e4c8c264ef8bda471f916424b7d04f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 11:04:21 +00:00
Zoey Chen
7a492b4098 Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev 2023-03-20 10:45:34 +00:00
SongFerng Wang
fa582a311f Merge "Modify the log at AutoSelectPreferenceController" into udc-dev am: d687c01745
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122899

Change-Id: Idc0a8d05d7565d00204b89ed6275d09bb74239c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 10:44:39 +00:00
SongFerng Wang
1ef40e5503 Merge "Modify the log at AutoSelectPreferenceController" into udc-dev am: d687c01745
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22122899

Change-Id: Ic8f886b6e0d8aece70f36f423b2c56fd12e4d2f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 10:44:38 +00:00
SongFerng Wang
953a6fec66 [automerger skipped] Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb am: 782bb2f069 -s ours am: 866c7e17f8 -s ours
am skip reason: Merged-In I81a597f28cf7ce25ff4eff5100bdb4d29c897a14 with SHA-1 7b9c22348a is already in history

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

Change-Id: I4f7d296365fa7dca6d5fd4bb434ff1549f7644de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 10:44:31 +00:00
SongFerng Wang
e3bcf8a199 [automerger skipped] Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb am: 782bb2f069 -s ours am: 866c7e17f8 -s ours
am skip reason: Merged-In I81a597f28cf7ce25ff4eff5100bdb4d29c897a14 with SHA-1 7b9c22348a is already in history

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

Change-Id: Ic40515e5c4acae8c29660152255e9cf633de3938
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 10:44:29 +00:00
SongFerng Wang
d687c01745 Merge "Modify the log at AutoSelectPreferenceController" into udc-dev 2023-03-20 10:43:33 +00:00
Betty Chang
aa7ec2d5fe Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952 am: 00a7d0788f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497

Change-Id: I7f299924d39ddc0952b301e622e4009064e923f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 10:29:38 +00:00
SongFerng Wang
866c7e17f8 [automerger skipped] Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb am: 782bb2f069 -s ours
am skip reason: Merged-In I81a597f28cf7ce25ff4eff5100bdb4d29c897a14 with SHA-1 7b9c22348a is already in history

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

Change-Id: If26f2822421623142391f3328d5ebd26097ae82b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 10:05:32 +00:00
Betty Chang
00a7d0788f Merge "[LE Audio] Set activity for result after scanning the QR code" am: 9541363952
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495497

Change-Id: I5ea028e5cab8a83b445d5590f0ae9f3965fb8e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 09:53:01 +00:00
SongFerng Wang
782bb2f069 Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev am: d911a095eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135268

Change-Id: Ideef6fbd4bd904456cb2b91207f8e2acdf54637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 09:29:21 +00:00
Betty Chang
9541363952 Merge "[LE Audio] Set activity for result after scanning the QR code" 2023-03-20 09:28:31 +00:00
Zoey Chen
cb4e0bd018 [Settings] Should not show WFC UI in the SIM page if the SIM does not
support WFC

Bug: 270792637
Test: manual
Change-Id: Ic67bd2e766d66c91fc4b0fcf5a5355debd805ac6
2023-03-20 09:15:55 +00:00
Zoey Chen
db02f10b07 [Settings] update the db list when back to UI
Bug: 271524675
Test: local test
Change-Id: I26c7d64e6f040c62c9efb1438efe328f5744fa02
2023-03-20 09:08:34 +00:00
Zoey Chen
b9f6bb7958 [Settings] Fix the inconsistent data/entity when switch the app/fragment
Bug: 271524675
Bug: 273825889
Test: local test
Change-Id: I7ec6d824c5154422aaad056dc3f4dcd365fef5e1
2023-03-20 09:04:24 +00:00
SongFerng Wang
d911a095eb Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev 2023-03-20 08:59:12 +00:00
Betty Chang
2a874ed261 [automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 am: 1de44c2447 am: 0fd1625895 -s ours am: 9a40a296cc -s ours
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba is already in history

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

Change-Id: I8ad731bdbbad463e7667e1c79816baa25839fc70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 08:53:00 +00:00
Betty Chang
ee536e004c [automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 am: 1de44c2447 am: 0fd1625895 -s ours am: 9a40a296cc -s ours
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba is already in history

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

Change-Id: Ibcec14b1fdaa8f859958a499932ec6dcee4f7ec4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 08:53:00 +00:00
Betty Chang
9a40a296cc [automerger skipped] Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 am: 1de44c2447 am: 0fd1625895 -s ours
am skip reason: Merged-In I416f0a39e31276876e63360664555f99dd7297c9 with SHA-1 a6d532cdba is already in history

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

Change-Id: I0886a26aba0650bc1699878e30ffb17ebbd3a3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 08:13:47 +00:00
Betty Chang
0fd1625895 Merge "[LE Audio] To remove the broadcast source item that created by receive state" am: 18eb985e41 am: 1de44c2447
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2495740

Change-Id: I704c81ac2d045142be5c7cc1835efa6d46cd2930
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 07:35:52 +00:00
Zoey Chen
4a3d0d7f8e Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev am: ce77de4240
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22142522

Change-Id: I52941b212917464a6489dcd2bf782bcb0f6e3519
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 07:19:45 +00:00
Zoey Chen
eadb730164 Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev am: ce77de4240
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22142522

Change-Id: Ic5b81e03b184c7ea94ceae385b4eef175bbdb189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 07:19:24 +00:00