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

123069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YK Hung
ae6a08b176 Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f am: 9dd71326dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: I32193af52903475dcf7f93f2cc6e4e82ca791707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 15:10:26 +00:00
YK Hung
9dd71326dd Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: If863d983c5f72cca4ae6a4c7c6afb47239f3be3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 14:41:50 +00:00
YK Hung
c429ca3e2f Merge "Add manual enabled battery saver reason (2/4)" into udc-dev 2023-04-10 14:03:33 +00:00
Daniel Huang
446ddf0e9e Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86 am: 2c2e65bd1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: I8a1102b3b9b95f513e86cb629d08d43609eed7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 08:04:57 +00:00
Daniel Huang
efeacacc7a Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86 am: 4e0371303b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: If30278d699e731f502ee9379e032b1640e6c9f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 08:04:52 +00:00
Treehugger Robot
deb61df42d Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5 am: 8b3797727f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I8ee77e14c956f424ec710fc71c5d225485bce9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 08:04:42 +00:00
Treehugger Robot
825450f1b8 Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5 am: 227b55d8c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I442e08f1badd0ff0570df968a683c0b2228bb177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 08:04:09 +00:00
Daniel Huang
4e0371303b Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: I27db019a7dbf1a237969a92969848d6ec13acd93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 07:38:04 +00:00
Daniel Huang
2c2e65bd1d Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: I5687f6c9827a34405ca1be4b5fdb452596e4e372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 07:38:02 +00:00
Treehugger Robot
227b55d8c1 Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I74fb50dc30c19c233c68856f65c248f5ed7cc552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 07:37:21 +00:00
Treehugger Robot
8b3797727f Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I812e4a865730a1d45bde9ae9f500b990e0d0c6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 07:37:18 +00:00
Daniel Huang
3f16621b86 Merge "Touchpad settings' icons update" into udc-dev 2023-04-10 06:49:06 +00:00
Treehugger Robot
35f9d486a5 Merge "Ignore ActivityNotFoundException from app launch" into udc-dev 2023-04-10 06:48:17 +00:00
danielwbhuang
eaa6a03d65 Touchpad settings' icons update 
Two icons need to be updated:
1. The touchpad speed setting inside of the touchpad settings
2. The bottom right tap setting inside of the touchpad settings

https://screenshot.googleplex.com/5QKLTwX8qNrnRsj.png
https://screenshot.googleplex.com/7iHNKwzwAZm5h8N.png

Bug: 269100659
Test: manual
Change-Id: I776e94325b1f54475f406a2fe11c4db4a0205f40
 2023-04-10 06:35:24 +00:00
Automerger Merge Worker
9c9c55d24d Merge "Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 am: f1a1637563" 2023-04-10 05:09:28 +00:00
Tom Hsu
19e2638508 Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 am: f1a1637563 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: I747487bb847adc2919093a454878e8cbf7309d72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 05:07:30 +00:00
Tom Hsu
da4c334402 Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 am: 09238601fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: Ic5172c0baf7e91ebcbcbea5bfeb5ffce457a7e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 05:07:22 +00:00
Tom Hsu
09238601fa Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: I6892186990d8ec5676759a6f073357d446b0c533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 04:39:34 +00:00
Tom Hsu
f1a1637563 Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: Ia369cf03f64b2614875fc013f663930894714a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 04:39:31 +00:00
Tom Hsu
5240d251e1 Merge "Make all sim list by ordering with slot id" into udc-dev 2023-04-10 04:13:55 +00:00
Automerger Merge Worker
ee3135f92f Merge "Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b am: 996851e310" 2023-04-08 21:54:19 +00:00
Elliot Sisteron
50af67d891 Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b am: 1b14767540 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ibecdb7dedf2dd056216859f4d52831ca1e365cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 21:54:08 +00:00
Elliot Sisteron
a6bd172d0b Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b am: 996851e310 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ibfb4d9b634b655fa7b41290dd3dac13ecd3a0f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 21:54:06 +00:00
Elliot Sisteron
1b14767540 Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ib50b4fb7f91dabab3f947b8481e91430d5472076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 21:26:36 +00:00
Elliot Sisteron
996851e310 Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ic26d725919b349c1959149b1229effac7ae2fbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 21:26:31 +00:00
Elliot Sisteron
bc1ee1264b Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev 2023-04-08 21:06:55 +00:00
Hao Dong
0100948ac8 Merge "Update the limit of split screen dialog strings." into udc-dev am: 8930e6ea87 am: 1599bc7b91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532887

Change-Id: I92bfc5bc0c396ba8515184b0ee2324dfa1057d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:39:13 +00:00
Florian Mayer
7e0596214b Merge "Move bootloader_override property" into udc-dev am: f58ea4671e am: e405f55e32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22234234

Change-Id: Idc3104355448c0b67e5a25719fc6ad58240354f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:37:26 +00:00
Hao Dong
be28cf536f Merge "Update the limit of split screen dialog strings." into udc-dev am: 8930e6ea87 am: e7edbd3543 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532887

Change-Id: I0559df3f928c43b149443858f41e8f24d870caa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:27:38 +00:00
Florian Mayer
fd9c686cd9 Merge "Move bootloader_override property" into udc-dev am: f58ea4671e am: ab14241e64 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22234234

Change-Id: I8c841b5198babacd18ca85c581992ff89e3600a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:25:50 +00:00
Hao Dong
1599bc7b91 Merge "Update the limit of split screen dialog strings." into udc-dev am: 8930e6ea87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532887

Change-Id: I0ec50ae9cb9fe08639ad870d0fd6681466f8edc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:12:43 +00:00
Florian Mayer
e405f55e32 Merge "Move bootloader_override property" into udc-dev am: f58ea4671e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22234234

Change-Id: I6d40815fcc55d6e5d7aa2587b98e6dbcef77f9de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:09:29 +00:00
Hao Dong
e7edbd3543 Merge "Update the limit of split screen dialog strings." into udc-dev am: 8930e6ea87 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532887

Change-Id: I6ef587b0500534bbb3d050a9375abccba25cee5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 20:57:52 +00:00
Florian Mayer
ab14241e64 Merge "Move bootloader_override property" into udc-dev am: f58ea4671e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22234234

Change-Id: Ia4d95a05268432874a40cfe4f905d28c269b30ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 20:54:07 +00:00
Hao Dong
8930e6ea87 Merge "Update the limit of split screen dialog strings." into udc-dev 2023-04-07 20:43:39 +00:00
Florian Mayer
f58ea4671e Merge "Move bootloader_override property" into udc-dev 2023-04-07 20:06:25 +00:00
Hao Dong
9266101608 Update the limit of split screen dialog strings. 
Bug: 277359484
Test: N/A
Change-Id: I006fa2bb26a5d2702af4bd9b2914278934ec4b1f
 2023-04-07 19:25:11 +00:00
Zoey Chen
3717b67997 Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c am: 5297f748e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530783

Change-Id: I64f08a5756883797ac204524fcd08e84aff2497e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 19:08:32 +00:00
Zoey Chen
d15fe76759 Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c am: 39baaf4353 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530783

Change-Id: Ib8fabdd09235d300299853300bf7068f68dcc14d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 19:06:16 +00:00
Florian Mayer
1ef1073694 Move bootloader_override property 
Bug: 274953227
Change-Id: I391329a14a5dda741103bd0097fee65ea97c866a
 2023-04-07 18:32:30 +00:00
Zoey Chen
5297f748e6 Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530783

Change-Id: Id20f9ad7e215e5860e71cae908b0eb2304cd8669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 18:29:53 +00:00
Zoey Chen
39baaf4353 Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530783

Change-Id: Ifc17093b61cd4dd83e1a4713050c82d4daf8cb83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 18:26:08 +00:00
Zoey Chen
8cd0c5816c Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev 2023-04-07 17:57:28 +00:00
Roshan Pius
580df886d3 Merge changes I8a6f01ab,I1b8c06a0 into udc-dev am: 7a49bfe6b0 am: 01149077d4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22482405

Change-Id: I228f5180779e4a3c658717e4d92c0310cadeac56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:53:16 +00:00
Automerger Merge Worker
c8de63a8d5 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours am: efc9c4ab6b -s ours am: eff901c18e -s ours am: 9aca022858 -s ours" 2023-04-07 16:52:54 +00:00
Roshan Pius
21f0ad2839 Merge changes I8a6f01ab,I1b8c06a0 into udc-dev am: 7a49bfe6b0 am: 5e7e88a4b6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22482405

Change-Id: I43d03ef8235cfd1ebc2495b6148c97ad2958e92e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:52:03 +00:00
Bill Yi
6287f186f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours am: efc9c4ab6b -s ours am: eff901c18e -s ours am: 097ac7eec5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I537b9695762051f039cff1dda08e3de253ff7c5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:51:49 +00:00
Bill Yi
9f3091af70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a568dc677b -s ours am: efc9c4ab6b -s ours am: eff901c18e -s ours am: 9aca022858 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60acaea7ac0852c8a11e9736d72486a0d0055328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:51:19 +00:00
Zoey Chen
4800801661 [i18n] Use Framelayout instead of Nest scroll 
Bug: 274538667
Test: local test
Change-Id: I2a6917a639ac6ba987df425d8974f9d51487a41f
 2023-04-07 16:34:47 +00:00
Roshan Pius
5e7e88a4b6 Merge changes I8a6f01ab,I1b8c06a0 into udc-dev am: 7a49bfe6b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22482405

Change-Id: Idbf64445aebae5cec752b7bb00f8c1ec29682947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 16:23:38 +00:00