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

123773 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Jedral
d08083bc1a Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 am: a711dc3a06 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I1cc88d80c7cf2cbca9a54fe5b4ca2a044b135973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:46:30 +00:00
Derek Jedral
6b96b8fc4f Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 am: fff41e6aa3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I31a9c9a6a2b2fb1578f57f8b701dd1abcd6e0deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:45:48 +00:00
Treehugger Robot
681a85f7d8 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 6dd01a2ef9 am: 870face978 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I636004b3bb282013b6a3277935500271cf79ba2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:04:24 +00:00
Derek Jedral
fff41e6aa3 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: I7aaeed6ad5967a88b04583b19f8b35e2551a3b3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:04:09 +00:00
Evan Laird
930bee6167 Merge "Set default value of battery percent preference" am: 145caf7d4e am: b4d2e7da30 am: ff6f9337c8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: I6af1354602e15a80f8c101ccad9b84cb89ba8131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:03:25 +00:00
Derek Jedral
a711dc3a06 Merge "Remove feature flag for active unlock" into udc-dev am: 9c67ee1eb1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23089996

Change-Id: Iede1c8c33c9c3999952f363625687482e5980b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:59:27 +00:00
Treehugger Robot
13b09784cb Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 6dd01a2ef9 am: 9eb3053b30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I0b2f85a83863d501b4a0837fe7d8ce75b4b52a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:39:12 +00:00
Treehugger Robot
c37d7456da Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 0c592cd8a7 am: 84d7ca0e35 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I30cf8bd2b496eb020b29b315dfece5849d4e6e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:38:21 +00:00
Treehugger Robot
870face978 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 6dd01a2ef9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: Ie03385ba50efc467c69fa51f63facaff559bf3f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:21:10 +00:00
Treehugger Robot
9eb3053b30 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 6dd01a2ef9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I02fb643894b84834bd9b39362f7dc117274c0a2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:17:40 +00:00
Evan Laird
ff6f9337c8 Merge "Set default value of battery percent preference" am: 145caf7d4e am: b4d2e7da30 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: Ifd81c0ea3c845d9f48b5eef143357960f21a66a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 17:17:25 +00:00
Derek Jedral
9c67ee1eb1 Merge "Remove feature flag for active unlock" into udc-dev 2023-05-09 17:17:11 +00:00
Treehugger Robot
84d7ca0e35 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda am: 0c592cd8a7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I4c6cbbcbb316fed1c6ec22cd4674494cd333a745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:57:56 +00:00
Treehugger Robot
6dd01a2ef9 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I71ec2340aaa88c8f6b2404a967b9876735af6121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:41:55 +00:00
Evan Laird
b4d2e7da30 Merge "Set default value of battery percent preference" am: 145caf7d4e 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: I34fe8a73fb89283e44dd46c9c655f8db9353e41b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:37:47 +00:00
Treehugger Robot
0c592cd8a7 Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev am: f4939a4bda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080180

Change-Id: I0965eeedb82446b8e50721e6618310221e37fa83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 16:35:03 +00:00
Treehugger Robot
f4939a4bda Merge "[Metrics] Remove locale string from Metrics because it should be reviewed" into udc-dev 2023-05-09 15:59:32 +00:00
Nan Wu
3916147ecf Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 am: cd6d1d53ca am: 3407bb7611 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I74a2fa05e95d1f71134909de50e47b198f1c14b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:56:59 +00:00
Evan Laird
145caf7d4e Merge "Set default value of battery percent preference" 2023-05-09 15:53:08 +00:00
Nan Wu
a1454b1c99 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 am: 1acff65bc3 am: 497a436d22 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I90a48c85869640be7f4d817d10c7d5f2b072963c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:47:42 +00:00
Nan Wu
c0dc0e24ab Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 am: cd6d1d53ca am: 5bbe972498 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I6e87cb403a35e1177177400d36c05f1154e8baa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:47:16 +00:00
Nan Wu
497a436d22 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 am: 1acff65bc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I198cf507f27779e52780ef8d83558fb5a1850289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:14:20 +00:00
Nan Wu
3407bb7611 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 am: cd6d1d53ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: If263ed1327fb7bc170ecc7409983fb6c2098ce21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:13:39 +00:00
Nan Wu
5bbe972498 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 am: cd6d1d53ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: Ib15e9b947c9c510ff7543446d4b442d5ff18e499
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 15:09:36 +00:00
Nan Wu
cd6d1d53ca Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I3d52133a999da5163b9d14d09afa9e8561292c9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 14:29:30 +00:00
Nan Wu
1acff65bc3 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev am: 38b99012f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087497

Change-Id: I8e5f2a5a2d4d44fb54d43a952c9a30b429791b6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 14:25:11 +00:00
Nan Wu
38b99012f4 Merge "Allow BAL for confirm device credential activity when work profile apps are protected by PIN prompt." into udc-dev 2023-05-09 13:49:06 +00:00
Vincent Wang
210df9e107 Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f am: 1e8948fbcb am: 65856e78af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: If8c599d38cb28634e493ce09e4d1367f39e40260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:28:24 +00:00
Chaohui Wang
9647867fb5 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 am: b52b6f6d46 am: 5a98395f99 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: I026894db44ed599a321f37665eb9b09cdc273421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:27:48 +00:00
TreeHugger Robot
9ac63685ba Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a am: e6998973d2 am: 8b404ed53c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: I5bdbbfb5bbc33e240c4c78767da51ab6ccd3d895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:27:34 +00:00
Chaohui Wang
5290d4a50c Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b am: 9a96e14cc2 am: fa0fbd1b4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797

Change-Id: I2359122342b2fa27fbc47f3f494d38883218a16d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:27:02 +00:00
Treehugger Robot
a9e50f478d Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6 am: 0cbdd648f5 am: fb54ae29f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: I1aa58e8a57922ee1e63ac60dd19fae4db213baf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:26:50 +00:00
Weng Su
c95cc8f8d9 Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 am: bfc8efc4de am: 1270d5ed43 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: I46e6ab5f8195cd7488b91e7219b4e67a6966d5e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:26:26 +00:00
Vincent Wang
98e4b25e7b Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f am: 1e8948fbcb am: 2e8cba3e95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: Ibc6c1ffbf94bd6027ca67673d72ce59b30ca25a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:26:20 +00:00
Chaohui Wang
39e6f88076 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 am: b52b6f6d46 am: 39c6a23f92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: I0ee232d3ec014fbdcb7d92b753aa2fe0844103c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:26:12 +00:00
TreeHugger Robot
268af9cc53 Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a am: e6998973d2 am: cbe5c8f504 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: I1e357fa6557e71e39a05177848541a5a492e2d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:26:04 +00:00
Chaohui Wang
4edb135481 Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b am: 9a96e14cc2 am: e2869f34fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797

Change-Id: Ia5ec69909da46d3dbec74dc80459d43f5306f768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:25:56 +00:00
Vincent Wang
c2579ea39d Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f am: ef5aa5d985 am: 3227aed5dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: I0b6be18e8b112baebd2b8d4ebb62282a0ae99455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:25:39 +00:00
Chaohui Wang
490bffa06d Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 am: 322234a222 am: e6866d70ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: I1af006294b0fef7cc33889e14d1df583b3e7d953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:25:29 +00:00
Treehugger Robot
fac860539e Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6 am: 0cbdd648f5 am: fe33d447f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: Ia78fea3f2ba241fc2582bed751438eab07561e80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:25:23 +00:00
TreeHugger Robot
89616fea14 Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a am: 1918f46ed1 am: beae23eca8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: I16a759208298683cbcf6b45c942d0a2a21f21f16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:25:13 +00:00
Weng Su
c6503d79bb Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 am: bfc8efc4de am: af32065193 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: Ia78c06d8881860e877610d62c433224511674a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:24:43 +00:00
Chaohui Wang
3c82ea6446 Merge "Fix ANR of SimSlotChangeService" into udc-dev am: d758fe853b am: 5e5e46833e am: 45a5b6ec69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083797

Change-Id: Iab3613c6c3c2aaa02f77165412b36e16f1cbd31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:24:15 +00:00
Treehugger Robot
9a44b0402c Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev am: 83cc6a64c6 am: bea756aa7e am: cbcc16ddcd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23101218

Change-Id: Ibeec2f373fd1a32dea549a973ec6bd773f933e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:22:02 +00:00
Weng Su
7b604ec792 Merge "Refine Settings textColor" into udc-dev am: e24cbeb6b7 am: aed54a1296 am: b6a52e9c74 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23083621

Change-Id: I0d3b241b554674f88bcd62facd4ca29f7d545b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:19:42 +00:00
danielwbhuang
c92bd9789d [Fixed] UI issues after rotation 
1. Use onSaveInstanceState to store the data.
2. Do not repeat to automatically select the keyboard layout.

Bug: 281481973
Bug: 281461013
Test: manual
Change-Id: Ieaa8fa3d2e6c22c39b34313d255e4f7869777a8b
 2023-05-09 20:03:17 +08:00
Guangjie (Jerry) Shi
3b5524c869 Merge "Fix work profile issue" into udc-dev am: ece191b09f am: deff8cb5a9 am: 519ff26f75 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: I78ea2ee9304e910548c725461f2198c62f207f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 12:03:14 +00:00
Vincent Wang
2e8cba3e95 Merge "Test Fix SettingRobolectricTest Fail" into udc-dev am: 5801e98d7f am: 1e8948fbcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074022

Change-Id: I3cfeb0c4e8117e4aca83e3a0da18050210d29236
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:33:29 +00:00
Chaohui Wang
39c6a23f92 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 am: b52b6f6d46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

Change-Id: I133e238da705871a308265ba66ea39e28b7e559f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:33:08 +00:00
TreeHugger Robot
cbe5c8f504 Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev am: 910530482a am: e6998973d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22981572

Change-Id: I739c4c8bfe467ab16c293ddd9c738e669ea15d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 11:32:48 +00:00