PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,929 Commits 1 Branch 0 Tags
47a9ea6d331d29fd93c394804c43e8ebccf1526c
Commit Graph

136929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
e79bdaef63 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 am: 3521df9dca 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: Ic739f9650dcfe638521dc0488c397ef9b8fa5ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 05:18:50 +00:00
Haijie Hong
005c47f19c Add feature flags for VolumePlus 
BUG: 309052662
Test: m Settings
Change-Id: I36aad5bb290aee835d586f0791347ab3a05e77f1
 2023-11-07 04:55:49 +00:00
Treehugger Robot
f19320aca6 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: I71614129cf95ac29f845dadf479135dcb3a5a48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 04:52:27 +00:00
Treehugger Robot
3521df9dca Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main am: 85ca373e75 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2810325

Change-Id: I0ac76dbfb034e1a9856b231aa59b3ec0197914d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-07 04:48:36 +00:00
Jun Lan
358a85ecfe Format battery java test code 
context:go/pixel-energizer-java-format

Test: manual
Bug: 304439460
Fix: 304439460
Change-Id: I5be0ee41afb3a7018bc7e25cceccc25669924d6c
 2023-11-07 12:27:43 +08:00
Treehugger Robot
85ca373e75 Merge "settings(payments): Use newly exposed formal API for CardEmulation.getServices()" into main 2023-11-07 04:08:35 +00:00
Treehugger Robot
01e207ede7 Merge "Check if the bedtime settings intent is null before launch" into main 2023-11-07 02:58:40 +00:00
Wa Gao
2ddabf5785 Merge "Add the controller for the top switch." into main 2023-11-07 01:22:43 +00:00
Wa Gao
aa5d7420db Add the controller for the top switch. 
Bug: 302189945
Change-Id: Ie43ac181e643a8b215ca830afc6ef670d91a5762
 2023-11-06 23:46:56 +00:00
Evan Chen
c218eb5d60 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 am: 0ff2532331 am: b375697a26 am: 20349c8e5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: If44b3568b159ea5e2ebbae2791044ad17c9df610
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:52:59 +00:00
Evan Chen
bd9f86d059 Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc am: aed207ff31 am: 3511d5be34 am: 813729892a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I40a0f82f64daf060df185e9a86326c72a5bd0c07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:52:20 +00:00
Evan Chen
75a0f0c4f8 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: cdc4580ec5 am: b2fd3a7029 am: 985f2d27f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I4f36808e54e1f78569a77a0260b8929d1339ba81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:51:40 +00:00
Evan Chen
b199308f57 Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 2abb356f2d am: cf17056d6d am: 858221156a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: I70239c51921193871a8ff4a0f123b0c9a38775a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:50:58 +00:00
Bill Yi
2ae41f33de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d333b903dd -s ours am: ecd4ffaf4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7fe87f2890d69e5c006323703d655a4a0bf5303c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:47:08 +00:00
Bill Yi
64cba2cb13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b3105688b -s ours am: 12fc0e97ca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5352a78fcd7f689c06e341eee5be927f17e6582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:47:05 +00:00
Evan Chen
231ece5e7b Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 am: 1ffcf416b5 am: f610f59272 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I93306c8fc34a7d89ea12d1e68ac75cae9729d2c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:46:43 +00:00
Evan Chen
75197c2d04 Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc am: e08372af9e am: 073f7c37fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Ice8289ffe8939db18285d3da93275b06997eaa1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:46:28 +00:00
Nino Jagar
a6e8467375 Merge "Update content protection toggle title text" into main 2023-11-06 22:40:05 +00:00
Eghosa Ewansiha-Vlachavas
4211b4a83c Merge "Set aspect ratio app list settings page id as attribtion in logs" into main 2023-11-06 22:38:10 +00:00
Evan Chen
20349c8e5a Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 am: 0ff2532331 am: b375697a26 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I765b1bcb6779b2db7f88063d36d1a036d0981577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:15:43 +00:00
Evan Chen
813729892a Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc am: aed207ff31 am: 3511d5be34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I7174453e4b835ad995290b73b67e285dd99c64b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:15:34 +00:00
Evan Chen
985f2d27f9 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: cdc4580ec5 am: b2fd3a7029 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I0e5bdc29fb9e02b9a608b0e0fa789551d72e1bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:15:25 +00:00
Evan Chen
858221156a Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 2abb356f2d am: cf17056d6d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: Id35b32e71b13e2afc54c619b390ce4c2d2700b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:15:15 +00:00
Bill Yi
ecd4ffaf4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d333b903dd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e8abfd0dd5b99781ac3c5ab68722ac3069e4fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:12:19 +00:00
Bill Yi
12fc0e97ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0b3105688b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6dec091708ec663571c45b6e919ca5bcaf3a701b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:12:02 +00:00
Evan Chen
d0cf24d6fd Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 am: 234916b836 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Idae3b94a4531033c01d2548787ae402e42b9591a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:11:01 +00:00
Evan Chen
4f56613f85 Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc am: 275cb36e07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Ia47af93a15d99b60071896ab60de72e889ee2357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:10:38 +00:00
Evan Chen
f610f59272 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 am: 1ffcf416b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I46debae6fb053a7c17ea9ef608de114002250c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:05:57 +00:00
Evan Chen
073f7c37fa Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc am: e08372af9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I1189d41247c5716d408024cd21ddcff18410f545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:05:48 +00:00
Evan Chen
b375697a26 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 am: 0ff2532331 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I460ee08df5313e35aec873719688ea19df568774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:04:15 +00:00
Evan Chen
3511d5be34 Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc am: aed207ff31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I01bf49740321a66ebb0c20dd68e06e2baad9916e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 22:03:58 +00:00
Nino Jagar
b5dff8f921 Merge "Use DeviceConfig flag instead of aconfig flag" into main 2023-11-06 21:33:39 +00:00
Evan Chen
0ff2532331 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I94766bf9a74894c16f60258e68fccd2f5ad1a0f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 21:29:48 +00:00
Evan Chen
aed207ff31 Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Ia69b3586114ad332f8c50214d42f436ea7966909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 21:29:34 +00:00
Evan Chen
234916b836 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I9f12a92d0e87557a371260d7f1f9e3a564683541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 21:27:38 +00:00
Evan Chen
275cb36e07 Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I6df6d866c4ffcea7592c653a2bf9ad20ca91fdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 21:27:31 +00:00
Evan Chen
b2fd3a7029 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: cdc4580ec5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I481338eaa8aa7a2b46aa89428216c8abf7c84f2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 21:26:57 +00:00
Evan Chen
cf17056d6d Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 2abb356f2d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: Ibb248b6478bc973fedaef8cc628eb6a0c53220f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 21:26:50 +00:00
Evan Chen
1ffcf416b5 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 am: 91233dd150 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Id1c2a4497a32af69f648d9dba7c97fb0c680166a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 21:26:25 +00:00
Evan Chen
e08372af9e Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc am: 9b0c7298cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: Ic95166f026df396b3f9ddb342ece9ec1b0f0876e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 21:26:15 +00:00
Bill Yi
d333b903dd Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-11-06 21:26:11 +00:00
Bill Yi
a8cfc6d99e Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-11-06 21:25:39 +00:00
Evan Chen
91233dd150 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f am: 0947ff6b98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I87d7e43b1559424220566fee510023b9fe0831a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 21:24:13 +00:00
Nino Jagar
a0b54107f1 Update content protection toggle title text 
Bug: 307604681
Test: Compiled
Change-Id: I66c6fcf28435012b93ca3964dc7c36a275484247
 2023-11-06 21:23:03 +00:00
Evan Chen
b8a4c29d5e Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: 4a33b437d4 am: dbd608df09 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I6ab40d8d4ba60f52a7c9b3974f7b639af0585baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 21:01:06 +00:00
Evan Chen
46ea8f8a03 Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 582edbd719 am: 221d2eddc9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: I6533eec64e6f939b3baf31d47f386f41514263e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 20:59:53 +00:00
Evan Chen
9411e46dd7 Merge "Make sure work profile app cant enable notification listener services" into udc-qpr-dev am: 857047f804 am: d72a0ec505 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008425

Change-Id: Ifa6df4ac0b2a457f2310f45b750908879dee3ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 20:58:06 +00:00
Evan Chen
9b0c7298cc Make sure work profile app cant enable notification listener services am: 3465535747 am: d1eadc08dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I529ed6c2ed248a52e295ae751cf42be4c5fe199f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 20:58:04 +00:00
Evan Chen
0947ff6b98 Make sure work profile app cant enable notification listener services am: 3465535747 am: 3cd41d5c6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007539

Change-Id: I7d6125bf4eeceb3fb3cad1f495e677694dd9b175
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 20:53:53 +00:00
Evan Chen
dbd608df09 Make sure work profile app cant enable notification listener services am: 5c6ca7959c am: dab54b5734 am: 4a33b437d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25008551

Change-Id: I5ab92642059d4480f49140ad699cc4ddffdf3a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 20:52:53 +00:00