PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
121,892 Commits 1 Branch 0 Tags
c6cb39b9655e9937985bb499518781fe8f96de9c
Commit Graph

121892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Hsu
c6cb39b965 Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609 am: fff9b76baf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143

Change-Id: I102f8f24c8dfbebae6a1751cc8ca23fd04d6dd6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 13:33:27 +00:00
Jason Hsu
fff9b76baf Merge "Update to use android:summary="%s" in ListPreference" into udc-dev am: b25a941609 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22162143

Change-Id: Id654d152809446154b53faa7d84010e650b3b08c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 12:57:18 +00:00
Jason Hsu
b25a941609 Merge "Update to use android:summary="%s" in ListPreference" into udc-dev 2023-03-21 11:38:02 +00:00
Angela Wang
79e850c4d9 Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2 am: 4b43e0b716 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175

Change-Id: I97a589a397602668a61429fd938e0bdfa0b85014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 10:03:05 +00:00
Angela Wang
7d89d19dbd Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2 am: 2b1e10e613 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175

Change-Id: Ia6b1cd4d5f989281e02635d07374b502084089df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 10:00:59 +00:00
Angela Wang
4b43e0b716 Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175

Change-Id: Ic88a092c01d1f0441615287485d5e0f4aef85c68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 09:27:18 +00:00
Angela Wang
2b1e10e613 Merge "Adds illustration to Flash Notifications settings page" into udc-dev am: 6dfcad2cb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22164175

Change-Id: I6fb33eaa0cb8768c0a9fa123ee3c951d68456cdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 09:26:28 +00:00
Angela Wang
6dfcad2cb2 Merge "Adds illustration to Flash Notifications settings page" into udc-dev 2023-03-21 08:44:04 +00:00
Angela Wang
139ee5037b Adds illustration to Flash Notifications settings page 
Bug: 274546785
Test: builds and checks the illustration manually
Change-Id: Iaaa49195fc062b2905b148352a5bd3e25807f207
 2023-03-21 05:11:45 +00:00
Kweku Adams
cefae4bddd Merge "Remove RESTRICTED bucket off code." into udc-dev am: f0c3812123 am: 8b735f191b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22075586

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

Change-Id: Ifbd6a72f5efeeedca6137fc3199cd9656298a5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 00:45:36 +00:00
Becca Hughes
a983d78b71 [automerger skipped] Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683 am: 79fb783267 -s ours 
am skip reason: Merged-In I481da16985027a49ee464623b6db166d941cab55 with SHA-1 fb4488ea83 is already in history

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

Change-Id: I999ece810834d51a1c80346ab97c149353fb7cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 00:43:45 +00:00
Zoey Chen
37152c6d03 Merge changes I26c7d64e,I7ec6d824 into udc-dev am: 1c47f309af am: 3feb199021 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22120466

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

Change-Id: Ia4a7f7bad1b3d07244456eada807973394c0c911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-21 00:00:26 +00:00
Betty Chang
1ad8ad8512 [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: 79932802dc -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: Ibb32cb73ae5c7b22997cd8db91a1e6f3932ed59f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:42:50 +00:00
Zoey Chen
0303294ec1 Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev am: 7a492b4098 am: 3066760ea9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135681

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

Change-Id: I64cd5610c4689c1521adbef6e70b7b1af5da58dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:42:20 +00:00
SongFerng Wang
5580bf69da [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: 953a6fec66 -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: I84d15284deea2a76819d3cda060602c463a61d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:42:10 +00:00
Betty Chang
328f4edc3a [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: 2a874ed261 -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: I8240d83db456aa533828066f12b136e0252d2bed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:42:01 +00:00
Zoey Chen
634a22b64c Merge "[Settings] Do not set text if the fragment is not attached" into udc-dev am: ce77de4240 am: eadb730164 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22142522

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

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

Change-Id: Ifca2b640e3963bbc365ad10e5be14db954f891ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:27:53 +00:00
Becca Hughes
5d829ccd04 [automerger skipped] Merge "Add subtitle to settings (settings)" into udc-dev am: 853c4a8683 am: 241b14fd9b -s ours 
am skip reason: Merged-In I481da16985027a49ee464623b6db166d941cab55 with SHA-1 6474e01372 is already in history

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

Change-Id: Idba1c0b6402447faf3f2913254a914d2fe4c0b3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:25:26 +00:00
Automerger Merge Worker
fb2ff9fd61 Merge changes from topic "am-17fa75bbe3d14606bc093a0b1a8af049" 
* changes:
  [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: 2b767e23c9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b -s ours am: 11970fc875 -s ours am: da6f0e89d3 -s ours am: 0a1cecff05 -s ours
  [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: 3bd0a334f1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452 -s ours am: d4b4e93227 -s ours am: 28d89441e8 -s ours am: 7f7f17724b -s ours
 2023-03-20 23:24:07 +00:00
Zoey Chen
8362487a43 Merge changes I26c7d64e,I7ec6d824 into udc-dev am: 1c47f309af am: 36df8ad640 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22120466

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

Change-Id: I2832cdad7f91b61abca77691f2fbaa183b47c153
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:22:32 +00:00
Bill Yi
0e6cc0b3ae [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: 2b767e23c9 -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: I60fc00ac0181522897e20c1098c8c62058b09be6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:21:49 +00:00
Bill Yi
3679eefd6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71e954c78b -s ours am: 11970fc875 -s ours am: da6f0e89d3 -s ours am: 0a1cecff05 -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: Ib0dd0294fdb4510f1952e067dbdeaf388712f971
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:21:46 +00:00
Bill Yi
4c67e8d7cc [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: 3bd0a334f1 -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: Ibb90256c3b55eef80524c72afe95328b0802b237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:21:38 +00:00
Bill Yi
a370349296 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 82c23db452 -s ours am: d4b4e93227 -s ours am: 28d89441e8 -s ours am: 7f7f17724b -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: Ia9c5489b321e85d19deae3a9a9f00ead8d8634f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:20:53 +00:00
Betty Chang
b908fbe306 [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: 226ba1bfc1 -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: I7f07fdc7327db23477789b31164ecd4f26465fba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:04:33 +00:00
Zoey Chen
7081c9eeb1 Merge "[Settings] Should not show WFC UI in the SIM page if the SIM does not support WFC" into udc-dev am: 7a492b4098 am: 08eea0993e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22135681

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

Change-Id: I20b14361f36172d639e6aaded32137696edb7ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:03:49 +00:00
SongFerng Wang
b4309f732b [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: e3bcf8a199 -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: I5880e783da574217990fb2464440ddca7618d3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-20 23:03:36 +00:00
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