Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
123,080 Commits 1 Branch 0 Tags
40af741095275e62f2581803addeb2819fc4b415
Commit Graph

48226 Commits

Author SHA1 Message Date
Becca Hughes
40af741095 Merge "Fix provider update bug" into udc-dev am: 5031d67f21 am: 01b75c9719 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

Change-Id: I337e45dbb93e15e2d1fe0465128555226c54e4b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:39:13 +00:00
Becca Hughes
015d352ccf Hide enable dialog and prefix pref wrongly enabled am: e513c71189 am: 847e29faf7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516

Change-Id: I171410b193418d45554642641601cf18ac592d65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:38:52 +00:00
Becca Hughes
01b75c9719 Merge "Fix provider update bug" into udc-dev am: 5031d67f21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23112934

Change-Id: Ibef3433141e67938efd2f3c07978870525e14a70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:02:14 +00:00
Becca Hughes
847e29faf7 Hide enable dialog and prefix pref wrongly enabled am: e513c71189 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23114516

Change-Id: I1dd252d3452d0591313e3544a421d29def096cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 22:00:18 +00:00
Becca Hughes
5031d67f21 Merge "Fix provider update bug" into udc-dev 2023-05-09 21:48:13 +00:00
Becca Hughes
e513c71189 Hide enable dialog and prefix pref wrongly enabled 
Test: ondevice
Bug: 281329396
Bug: 280905737
Change-Id: I82652a2520a2f9ca9bc7f8f78cf020bef7af0b15
 2023-05-09 21:16:01 +00:00
Becca Hughes
49d11e4995 Fix provider update bug 
Test: make
Bug: 280905737
Change-Id: Ia7f33f4c5e1168cadd66119c42bd52e0a80eda10
 2023-05-09 20:41:51 +00:00
Evan Laird
2785a8410d Merge "Set default value of battery percent preference" am: 145caf7d4e am: b4d2e7da30 am: ff6f9337c8 am: 930bee6167 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1719617

Change-Id: Ic3dd3167fac3cc4a3fd82e1caeddc104db871899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 18:46:43 +00:00
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
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
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
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
Chaohui Wang
b52b6f6d46 Merge changes I07d964b9,Ifa5928e1 into udc-dev am: 1cc7d75d91 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23081917

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I009af82ec74183ac86cefe8e76e56c9ad74f7ce3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:42:34 +00:00
Guangjie (Jerry) Shi
deff8cb5a9 Merge "Fix work profile issue" into udc-dev am: ece191b09f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: I32d95d5daa4c5ad249e1e3daaae6ab42343e7893
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 10:26:04 +00:00
Jack He
ceb3ec60ee Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: Ia9c2d8f8d19567ab3e28bddb87bbff0fe0351c7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 09:56:46 +00:00
Chaohui Wang
1cc7d75d91 Merge changes I07d964b9,Ifa5928e1 into udc-dev 
* changes:
  Fix flicker in SIM card page
  Clean up DefaultSubscriptionController.getSummary
 2023-05-09 09:02:19 +00:00
Guangjie (Jerry) Shi
bb63e41746 Merge "Fix work profile issue" into udc-dev am: ece191b09f am: bcd1326690 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: I4cfeb45b10060bbd54bc61c46c7349f19ac6098f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 08:33:33 +00:00
Jason Chang
12d36b5e36 Merge "Fix 'Do it later' button overlaps with text depending on landscape direction" into udc-d1-dev am: 5f7ffb31d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050583

Change-Id: Icb12347896766ae956edf8220a05f0e7436b3f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 08:32:00 +00:00
Jack He
191fe2ab6f Merge "Remove CSIP/VCP enable/disable from Setting" into udc-dev am: d55e645795 am: 7d96f185ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23065696

Change-Id: Ie8db1e59e1fe9a5363c4bbd7940e9795a755ce9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 07:35:57 +00:00
Guangjie (Jerry) Shi
bcd1326690 Merge "Fix work profile issue" into udc-dev am: ece191b09f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086871

Change-Id: I174d4a00736084a32821c5328540b4e2d2663d7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 07:26:46 +00:00
Shawn Lin
e601136991 Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

Change-Id: Ie692511a4b8bbd56b23c93dde8019f3f9072e425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 07:13:08 +00:00
Jason Chang
5f7ffb31d2 Merge "Fix 'Do it later' button overlaps with text depending on landscape direction" into udc-d1-dev 2023-05-09 07:03:38 +00:00
Shawn Lin
5a62b289e9 Merge "Set the talkback focus to the header text when Stage is NeedToConfirm" into udc-dev am: f5b4a2388d am: 01a434865f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23053883

Change-Id: Ibe57a45ee6586e718b1834350fb7898c0fa4b1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 06:16:00 +00:00
TreeHugger Robot
910530482a Merge "Fix the UI in the left side & right side inconsistent problem" into udc-dev 2023-05-09 06:01:11 +00:00
Chaohui Wang
d758fe853b Merge "Fix ANR of SimSlotChangeService" into udc-dev 2023-05-09 05:38:11 +00:00
Treehugger Robot
83cc6a64c6 Merge "Revert "Remove CSIP/VCP enable/disable from Setting"" into udc-dev 2023-05-09 05:33:40 +00:00
Treehugger Robot
7251199304 Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304

Change-Id: I8818f8d1c0df1a2e00b29aef7463643e2b5f7fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 05:33:40 +00:00
Treehugger Robot
a46d251e01 Merge "Disable provider if removed from primary" into udc-dev am: ee54d713d5 am: 25115c82a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23092304

Change-Id: I39a9f78342ca0796eabc20c26275229cba170e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-09 04:43:35 +00:00