PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,592 Commits 1 Branch 0 Tags
2ae41f33de3392646b5f5a00d8200be7f482571f
Commit Graph

136592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Nino Jagar
b5dff8f921 Merge "Use DeviceConfig flag instead of aconfig flag" into main 2023-11-06 21:33:39 +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
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
Evan Chen
221d2eddc9 Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 582edbd719 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

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

Change-Id: Ia93b35fcd15b3158f3b4590e00eea466f03a1ac1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 20:30:19 +00:00
Evan Chen
d257dbed63 Make sure work profile app cant enable notification listener services am: aa122da7d6 am: 4231ecf16b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/25007537

Change-Id: I3c06fa3c9b61668b8943dc15ead0f2d68a7c169c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 20:28:47 +00:00
Bill Yi
a5c4a422e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c16d42d414 -s ours 
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

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

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

Change-Id: Ica7d3101c8f1efbc798654d0492fa87dcfee28fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-11-06 20:11:40 +00:00
Nino Jagar
bf97254dd7 Use DeviceConfig flag instead of aconfig flag 
Bug: 308610589
Test: Units
Flag: EXEMPT
Change-Id: I3ff34b4048d8c0f0101f74fbab0498f91c7c2409
 2023-11-06 19:28:38 +00:00
Evan Chen
857047f804 Merge "Make sure work profile app cant enable notification listener services" into udc-qpr-dev 2023-11-06 19:15:32 +00:00
Nino Jagar
b1852541a0 Merge "Disable content protection settings if no service" into main 2023-11-06 18:50:50 +00:00
Eghosa Ewansiha-Vlachavas
85b3279d7a Set aspect ratio app list settings page id as attribtion in logs 
When loging the users aspect ratio change, set the logs attribution as
`USER_ASPECT_RATIO_APP_LIST_SETTINGS` if the user came from the aspect
ratio app list page.

Fix: 309424648
Bug: 298030311
Test: atest SettingsSpaUnitTests:UserAspectRatioAppsPageProviderTest && UserAspectRatioAppPreferenceTest
Change-Id: Ia88f0dee8ed2c9c8e54919cf02c7526caf944dee
 2023-11-06 13:13:29 +00:00
Yi-Ling Chuang
9718ae0aa9 Add battery warning TipType 
Bug: 309054332
Test: rebuild
Change-Id: Ib7f95eb14aac7ac6d6a0941ea40a9eb723fa9300
 2023-11-06 15:43:57 +08:00
Xinyi Mao
2736ca15bb Merge "Update all forcestop icons in Settings." into main 2023-11-06 07:14:59 +00:00
Jun Lan
43f436e065 Merge "Format battery java code" into main 2023-11-06 06:48:20 +00:00
Treehugger Robot
75de0f5ae9 Merge "Revert "[PK settings] Remove metrics."" into main 2023-11-06 06:42:57 +00:00
mxyyiyi
8e7bf5d2c1 Update all forcestop icons in Settings. 
Test: manual
Bug: 308893988
Fix: 308893988
Change-Id: I007225c390a922c69f2b32d0d1dbd4224e5bc4b5
 2023-11-06 14:12:54 +08:00
Jun Lan
cca804e1ed Format battery java code 
After this CL, we can follow Guideline:go/hc-mainline-dev#format-code to keep java format consistent.

Test: manual
Bug: 304439460
Change-Id: I5bb77f81b0bd9be618e34942eaaee8296bc42796
 2023-11-06 13:55:48 +08:00
Jun Lan
da70c86bda Merge "Replace HashMap with ArrayMap for better performance" into main 2023-11-06 05:31:07 +00:00