PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,419 Commits 1 Branch 0 Tags
00ac6a4e584f59b97dacfcef93fdd4682bcdbf50
Commit Graph

123419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
24c70bdc05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8358793b04 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3404131b0ea07bb5d6cd72f23d31806a4c1032db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:19:54 +00:00
Bill Yi
1972b60ef0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 0dc9c8274b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If57d64cb0d0306d162a8d014b931f0a2b7eb6e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:19:27 +00:00
Bill Yi
681eb89bef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e2d2c132f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id7521b440db06abbf5314e9af8d9a0ab755c3e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:19:02 +00:00
Bill Yi
44ed9dfb76 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-13 05:05:19 +00:00
Bill Yi
9c68107136 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-13 05:05:19 +00:00
Bill Yi
a089683f72 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-04-13 05:05:19 +00:00
Bill Yi
cb2bb50cd2 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-13 05:04:31 +00:00
Bill Yi
aac929ea24 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-13 05:04:31 +00:00
Bill Yi
0dc9c8274b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-13 05:04:31 +00:00
Automerger Merge Worker
4872df63eb Merge "Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7 am: 929730c615" 2023-04-13 05:04:05 +00:00
SongFerng Wang
9631c9bc25 Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7 am: 929730c615 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573808

Change-Id: Ia0a6abf5d5c551170f4177c12463ea2ffd0dc280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:03:28 +00:00
SongFerng Wang
e58f81e111 Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7 am: 48d04ef4d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573808

Change-Id: I6a592946e72a21eabf764a00834fae37e4a3d4ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 05:03:27 +00:00
Treehugger Robot
6ad5b9a5f3 Merge "Fix b/277880435: System battery settings app crash" into udc-dev 2023-04-13 04:50:59 +00:00
SongFerng Wang
929730c615 Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573808

Change-Id: Ic8bdf4721b788fff506a9bcd6668ca9d317d5527
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 04:36:30 +00:00
SongFerng Wang
48d04ef4d3 Merge "Fix the IndexOutOfBoundsException" into udc-dev am: 133fe9fbc7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573808

Change-Id: I6d70e0298d4c796a1e607f707ec4fb496e913c67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 04:36:22 +00:00
Varun Shah
b056d0ead5 Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c am: 0c31c38a9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865

Change-Id: Ic76b8a655038b1b5a790c0becfd29a35c5948fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 04:17:24 +00:00
SongFerng Wang
133fe9fbc7 Merge "Fix the IndexOutOfBoundsException" into udc-dev 2023-04-13 04:12:32 +00:00
TreeHugger Robot
03977844cc Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c am: 83692baf4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807

Change-Id: Ib871ce49025d3886ab9db9c4b9f87d43f764efd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 04:05:01 +00:00
Varun Shah
582f0e130c Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c am: 1d00be1ad5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865

Change-Id: If3aaeebba9ebde14a1a7f04a570a515b23b36234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:52:18 +00:00
Varun Shah
0c31c38a9e Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865

Change-Id: Ib76cebb5a301b41be1b4a6e95ae50fff38020ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:51:28 +00:00
Varun Shah
1d00be1ad5 Merge "Update the default wellbeing package config." into udc-dev am: 4cf335d53c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532865

Change-Id: Ic6a7dad6b860f114b972ae431f53fc25130e9093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:51:21 +00:00
Daniel Huang
682413d366 Merge "Use ScrollView to include the full layout." into udc-dev am: 6e55a52559 am: a52ac4eae7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573537

Change-Id: Id504ebc7b366604b6839e0f7a0604afafadc57d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:44:32 +00:00
Varun Shah
4cf335d53c Merge "Update the default wellbeing package config." into udc-dev 2023-04-13 03:38:10 +00:00
Treehugger Robot
c2ab1f16ba [automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours am: 2f0557495d -s ours am: d1267c1675 -s ours am: 35f746dade -s ours 
am skip reason: skipped by user delphij

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

Change-Id: Icdace303a527fc021a555094ffd49956ffd6cc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:34:33 +00:00
Treehugger Robot
5894ed0686 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a -s ours am: dacb81d743 -s ours am: 635c0e08ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccfee42fa416a5498b89cdaf1554f705e8177ba2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:26:42 +00:00
Bill Yi
08057bd110 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b -s ours am: d145911bf1 -s ours am: c3dfe52e8c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I69c38582cba570ae3f87ed54da54303b76ed108f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:25:58 +00:00
Zaiyue Xue
29da0e6d9f Fix b/277880435: System battery settings app crash 
Bug: 277880435
Fix: 277880435
Test: manual
Change-Id: I369c04584c95c13e8636b5c9713e26e528ab627a
 2023-04-13 11:23:46 +08:00
TreeHugger Robot
ece31ef275 Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c am: f2e7f45fe6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807

Change-Id: I99703722ae243086389eab49563a715f7a7513c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:23:07 +00:00
Daniel Huang
e84a107b6e Merge "Use ScrollView to include the full layout." into udc-dev am: 6e55a52559 am: b009dc72a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573537

Change-Id: Ie83451d71d522b5b5c462dad5a6141c749eea287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 03:01:28 +00:00
Treehugger Robot
bfbe9c834d [automerger skipped] Merge "Merge TQ2A.230405.003" am: fd8670a4c1 am: 5d93cea1c7 -s ours am: 2f0557495d -s ours am: d1267c1675 -s ours am: 30f5c10510 -s ours 
am skip reason: skipped by user delphij

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

Change-Id: I62d0e589a8618b8b7d5150fbc09f7eea2bea239d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:55:04 +00:00
Treehugger Robot
844a2ff7de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8e95c6e66a -s ours am: dacb81d743 -s ours am: 3ae935bc1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d4a4a61ee36dfe46fa12dd1392db4d00f864870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:50:40 +00:00
Bill Yi
491c38bfb8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 817fa66f8b -s ours am: d145911bf1 -s ours am: 009f4b1ee3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I443f9a8a3acdffcb1a9a15dcb4ffc40a4078c61d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:48:47 +00:00
TreeHugger Robot
83692baf4d Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807

Change-Id: I44d88661d9eb68d745e7953df945236c965c10f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:48:13 +00:00
TreeHugger Robot
f2e7f45fe6 Merge "Remove plug/unplug condition for the incompatible charging" into udc-dev am: 70ef00405c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573807

Change-Id: I8acb55c68dfa080548169dcbcc24b634aa2db297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:47:51 +00:00
Bill Yi
a3dfec6bb5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce -s ours am: e5a98b540e -s ours am: 9a1fe79b1a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6e05e5476efbd3ebe0ae6316573b511ed01c63a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:43:38 +00:00
Hao Dong
59537d1834 Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94 am: cc0d6acce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994

Change-Id: I6b1584165e04ec492a488df2f612cd4cc8576f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:42:58 +00:00
YK Hung
4be00b0766 Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56 am: 26b8b4c088 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805

Change-Id: I106c05b244b603ecc7c9207253e7d94b2b942a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:41:03 +00:00
Treehugger Robot
9cc845069e Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3 am: a7152b9573 am: c366b8381c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: Idae38f76acb06007c70d860a505f45f0a479ca38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:32:24 +00:00
Marcelo Arteiro
52f43dfdf3 Merge "Fix for Check mark color on Regional preferences" into udc-dev am: cab738bf39 am: 379150e898 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573598

Change-Id: I2ffb6538b1f01e15af2dc0543d0c332f8ee7e280
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:32:11 +00:00
Vania Januar
4194cf1c5d Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a am: d673f304c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282

Change-Id: I4b8b35b932c158b9e98779e4486be82cffa5f1bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:29:42 +00:00
Automerger Merge Worker
218fa19f35 Merge "Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b am: d250ee1a8b" 2023-04-13 02:29:37 +00:00
Bill Yi
4f095e6d23 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bc0dc12fce -s ours am: e5a98b540e -s ours am: 4c6996b55c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I132b41fb8abc7caf4d984b5de5a1ad5b3fbb0038
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:26:52 +00:00
Treehugger Robot
87d90cc1c4 Merge "Fix App languages for work profile" into udc-dev am: 568ba14b9b am: d250ee1a8b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530839

Change-Id: I49b5265140364d99ac67867828a0efb97b7017c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:26:48 +00:00
Automerger Merge Worker
0677736292 Merge "Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd am: 9e28310519" 2023-04-13 02:26:42 +00:00
YK Hung
c229716c6d Merge "Optimize screen time cross power connection logic from O(N^2) to O(N)" into udc-dev am: c00fb2efbd am: 9e28310519 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573802

Change-Id: Ibfb95f2e9dcf632da581bf045149d818a01b62f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:26:36 +00:00
Hao Dong
e382c39e38 Merge "Fix biometrics unicorn consent string bug." into udc-dev am: ad5954bc94 am: e5946f6858 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22578994

Change-Id: Ied41df2285a984d0cc9220244f7208acf40dca8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:26:15 +00:00
YK Hung
f4d44bcfff Merge "Small refactor battery usage code according to the comments in previous cls." into udc-dev am: e4c3f68b56 am: 3c47574638 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573805

Change-Id: I8f7828fb51361ff560984b1de0320b234e7adb64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:26:04 +00:00
Treehugger Robot
e3c1bbf359 Merge "Align Settings and SystemUI packageName references" am: 1452f7dd3a am: ff6def3c7c am: 525b567db3 am: a7152b9573 am: 7bf829b4a6 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2530819

Change-Id: Ica0b365494d5d14acfddeb84dd83b28e81b13e50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:23:22 +00:00
Marcelo Arteiro
ba9e9abaa5 Merge "Fix for Check mark color on Regional preferences" into udc-dev am: cab738bf39 am: ad2457b1ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22573598

Change-Id: I8afb28969ddcb6b45656e4a1f0a30bdd63b37fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:21:51 +00:00
Vania Januar
c7329bf42e Merge "Add developer options to force enable Notes role." into udc-dev am: b79772ac3a am: a24e7dc12a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22459282

Change-Id: I836cfd095b654ef4b55abb1474a19cd4ced4f1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-13 02:20:27 +00:00