Commit Graph

124067 Commits

Author SHA1 Message Date
Charles Chen
8ad361f548 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: b67f9c939d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: I9405881518e5b4afa21dc7d8e69afc95ce4b3877
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:09:54 +00:00
Charles Chen
2bc77140bb Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: 492530af2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: Ic2aa13fd6523bb97bdb7b79fe0013ca1f2f64779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:09:22 +00:00
Charles Chen
4a048e404a Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: 492530af2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: Idbe0fe4c1836bcf2d7760e92f8e5245112734c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:05:27 +00:00
Charles Chen
492530af2d Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: I22e5078be5ab34e25be33a58939a1257c1bdcd4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 06:27:59 +00:00
Charles Chen
b67f9c939d Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416

Change-Id: I17b847e8ab3cc4911342b4db900d53640df007fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 06:23:42 +00:00
Sunny Shao
b723c4f96a Fix the updateDialogForCdmaPhone test case failed
- This is a side effect of the CL(ag/16379105) which removed the getTextAsDigits API.
- Update the return value as empty string of the TelephonyManager.getImei().

Fixes: 215071948
Test: atest ImeiInfoDialogControllerTest
Change-Id: I790b5dc505ad1a91a951a4c46b241baddea392a1
2023-05-08 14:01:23 +08:00
Charles Chen
f22d51b5f6 Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev 2023-05-08 05:39:07 +00:00
Guangjie (Jerry) Shi
98600aff36 Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 860002b42c am: 30f7b3f66c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: Ife6345c76926ef0250ab6f96b87a3481587d72b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:48:39 +00:00
Guangjie (Jerry) Shi
6091e80755 Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 90869f6fab am: a537078a3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I76c106dfc50c359362aaa421be6a7539f6e4b819
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:23:24 +00:00
Guangjie (Jerry) Shi
4b5343c294 Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 860002b42c am: cdbf216781
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I9fc16d8ef9a9f54ca1140da499bdf993f20f0d59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:22:43 +00:00
Guangjie (Jerry) Shi
a537078a3d Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 90869f6fab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I7f0add571feff5f301d38ee10b8f068322774105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:06:05 +00:00
Guangjie (Jerry) Shi
30f7b3f66c Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 860002b42c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I37ff8277ac3e2fd71a990ac3f9ae5e6972c55bfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:05:18 +00:00
Guangjie (Jerry) Shi
cdbf216781 Merge "Use correct filter" into udc-dev am: cf440dcae5 am: 860002b42c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I438c8153d07882280f6eef757fb11958bc0cc64f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 04:01:25 +00:00
Guangjie (Jerry) Shi
860002b42c Merge "Use correct filter" into udc-dev am: cf440dcae5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I731560cdaae8973c95f87e1a3af108356b42505b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 03:24:29 +00:00
Guangjie (Jerry) Shi
90869f6fab Merge "Use correct filter" into udc-dev am: cf440dcae5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048001

Change-Id: I1a2232ecab3a2cdb9c5af81b382a422284b0c323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 03:20:25 +00:00
Jack He
6b9e21e8db Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85 am: 9768e06a1e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: Ib9f3d13b11249adacdb3f36de7003acd8720d9bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 02:43:37 +00:00
Jack He
09fadb9b53 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 518d08f978 am: 61e20187bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I3e7a75bc3e2c8e0956a63440d7ee3b112ffe0aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 02:41:00 +00:00
Patty Huang
5bcdee2346 Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details am: f05615f1e8 am: 636eb36df0 am: 06f934c87e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994938

Change-Id: If6db013c611620ab628615a398cd0734ce8209ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 02:40:58 +00:00
Jack He
9539ac8974 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85 am: a38db8628e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I405e57473de63cb16f7ae2059d75c3db593b69b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 02:38:33 +00:00
Guangjie (Jerry) Shi
cf440dcae5 Merge "Use correct filter" into udc-dev 2023-05-06 02:38:26 +00:00
Jack He
61e20187bd Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 518d08f978
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I196b9081f1c6442834dc2884d2c96bdf6eaf2a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 02:01:21 +00:00
Patty Huang
06f934c87e Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details am: f05615f1e8 am: 636eb36df0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994938

Change-Id: I5e059589b04bc9ec3849b27c570e0a876fabfe55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 02:01:19 +00:00
Jack He
9768e06a1e Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I555838c800e6d5c89d20601347decf58caa37993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 02:00:48 +00:00
Jack He
a38db8628e Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa am: 22e2bd2b85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I72f712e1996efe37547b14ca2e0c5dd806a49180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 01:56:57 +00:00
Treehugger Robot
972423a2aa Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 am: 9a9a6b13f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Ie857ab16a7a38c6543698e04c0a456c1e8205bb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 01:40:24 +00:00
Treehugger Robot
a5fff2a551 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: 0e8839d15c am: 74375351cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I6e06d53a8089dc2a9b0a09d76ad2fb37ecd4c019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 01:38:52 +00:00
Treehugger Robot
9b6a7daf95 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807 am: 14efad99d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Icb0f9c343ff90fc5d032da8276640a895407698f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 01:37:45 +00:00
Jack He
518d08f978 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: If404c06085d34c9f87b164c4b396da782e4e64fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 01:16:07 +00:00
Jack He
22e2bd2b85 Merge changes from topic "LeAudioBeta" into udc-dev am: 2605ccbcfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994939

Change-Id: I5ad786001f89627dbede25e1db8aae59da83af82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 01:16:06 +00:00
Patty Huang
636eb36df0 Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details am: f05615f1e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22994938

Change-Id: I5cfb6ea17ed21f359c07f67b299f6f57c6f6d63e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 01:16:05 +00:00
Treehugger Robot
74375351cb Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: 0e8839d15c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I8c7fa00351d7e867e7830e3de70cf15d1b05a874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:54:58 +00:00
Treehugger Robot
9a9a6b13f5 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I5ccdf60696b11fb4258055103381155c3f16a176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:54:36 +00:00
Treehugger Robot
14efad99d4 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d am: b492914807
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: Ie1f2311d208380d807a52411fcd398d77b61aae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:52:36 +00:00
Jack He
2605ccbcfa Merge changes from topic "LeAudioBeta" into udc-dev
* changes:
  Hide the LE audio toggle by flag
  Add toggle to show/hide the Per Device Enable LE Audio Toggle in Device details
2023-05-06 00:42:40 +00:00
Becca Hughes
05757330df Fix settings live update am: 481be6dde4 am: f736380002 am: d4c33e36cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: Iec15d7310b0fc249b8494cdade3f9341e07450bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:36:02 +00:00
Becca Hughes
e4bc3c1918 Fix newly installed providers bug am: 17a0266b16 am: fc4a33b355 am: 10c84dc4a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: I6e70f50ca955d2049525ac4616f1a0d595d88307
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:35:04 +00:00
Guangjie (Jerry) Shi
706d298584 Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 6ee57bd7b8 am: 2bf52acd0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: I09d4cd580feb1382ce7f8ce3a8431ad0e9e3bccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:33:38 +00:00
Chaohui Wang
9ad628f4fc Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 7e441b2496 am: c7ee31956d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: I64dea67242931420ce1379add027c1dbf1aea2eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:23:08 +00:00
Becca Hughes
8641a39b80 Fix settings live update am: 481be6dde4 am: eb5c65a43b am: a85c239613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: Ia8d41eb7c84a38a57eb9ab2af632bdf68d44c172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:17:34 +00:00
Treehugger Robot
0e8839d15c Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I4dd7fcb722810ecc8a844b5353f3b202b7e9f72c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:12:51 +00:00
Treehugger Robot
b492914807 Merge "Set primary services as enabled" into udc-dev am: 1dc52d159d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23047998

Change-Id: I45f5fbe9c81c81c111661a33f1c418a604de2977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:12:42 +00:00
Becca Hughes
d4c33e36cf Fix settings live update am: 481be6dde4 am: f736380002
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I9699ca0f16a48a1069903b333150f95486962f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:01:09 +00:00
Becca Hughes
10c84dc4a0 Fix newly installed providers bug am: 17a0266b16 am: fc4a33b355
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23048200

Change-Id: Ied88bf7e2c846c4b9d6d165da76c9797615b7151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-06 00:00:27 +00:00
Guangjie (Jerry) Shi
2bf52acd0c Merge "Do null check to account for the case where provider is only autofill provider." into udc-dev am: 2898e3b527 am: 6ee57bd7b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23055667

Change-Id: I4e6d2fd92a359a81d9eb1e98defafca8571fb80a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:58:58 +00:00
Chaohui Wang
c7ee31956d Merge "Fix dialog leak in RequestPermissionActivity" into udc-dev am: 5b18837a49 am: 7e441b2496
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012490

Change-Id: I3f6074a0be4c3c5bb7db43f11428fda8c2d4d9ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:54:23 +00:00
Becca Hughes
ed295c248e Use correct filter
Test: TH
Bug: 280908763
Change-Id: I8a80e8533578b5e0b7a9b516c488b3602d18feef
2023-05-05 23:42:29 +00:00
Becca Hughes
5e9b4bf2e2 Fix settings live update am: 481be6dde4 am: eb5c65a43b am: dd4b33d784
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I0f22afebc2b1930b3d18239cecec98882be22b52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:41:36 +00:00
Treehugger Robot
1dc52d159d Merge "Set primary services as enabled" into udc-dev 2023-05-05 23:40:43 +00:00
Vania Januar
9a94ce4426 Merge "Replace placeholder icons with stylus icons" into udc-dev am: 072d8b90d0 am: 7f65b03c73 am: 8dfae8505d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23025585

Change-Id: I7c5dea3e39367912df741f200d349abea04742f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:39:42 +00:00
Becca Hughes
a85c239613 Fix settings live update am: 481be6dde4 am: eb5c65a43b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23061769

Change-Id: I30931cb72a1906baeea0bccfca50deb192a00d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:34:01 +00:00