Treehugger Robot
e2f4b5d242
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806 am: e42c86703b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I0b4e8fa0a9abffeb8dd459386f037380eb0d3d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:24:13 +00:00
Treehugger Robot
01624257fb
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 93ab64ef47 am: 33ba391274
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I2c3540a7c7828f23ebb8ce13a8c237cfd772ccea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:20:09 +00:00
Treehugger Robot
d0304faca7
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: 99c883fd3f am: c19f24b092
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I49397ccb1702f6c802c220c2a526a6dbec497e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:19:59 +00:00
Treehugger Robot
e2ac5c55dc
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc am: 06e92b4bf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: Ib93f52eec186b4f3aeb535cf708d6184576b8b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:19:51 +00:00
Treehugger Robot
674600b53f
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806 am: 2ea4f0747e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: Ib012475ebf31463dd2249c95cf7e33d34a2360cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:19:37 +00:00
Treehugger Robot
33ba391274
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: 93ab64ef47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: Ib5467588c0b5c6cc68f97d95bdeb58f84e115b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:43:20 +00:00
Treehugger Robot
c19f24b092
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: 99c883fd3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I8f129892f4f10838a059730436d4ae957846b476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:43:12 +00:00
Treehugger Robot
e42c86703b
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I417be26a4538146e20432c71bf6858e1f6bc8026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:42:00 +00:00
Treehugger Robot
06e92b4bf8
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967 am: b5682235cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: Idf5508432319cec7cc2f5239260e3365d6e55ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:38:52 +00:00
Treehugger Robot
2ea4f0747e
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9 am: dc11c24806
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: Ieeb3a1b72e00c95592374b5e595e5b2d01906ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:38:45 +00:00
Treehugger Robot
b5682235cc
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I18598bec86a2ad09837544559b7044eda190a247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:00:53 +00:00
Treehugger Robot
dc11c24806
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I583abc51b4e4160783d8ca14d810418b675892d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 10:59:44 +00:00
Treehugger Robot
93ab64ef47
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I231ff30e5df9248bf3713511ebb00795c502cba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 10:56:22 +00:00
Treehugger Robot
99c883fd3f
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I7544b0326987e4397d7baab8514b1d1388d52005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 10:55:48 +00:00
Treehugger Robot
23d3eda967
Merge "Fix the battery string incorrect spelling" into udc-dev
2023-05-08 10:36:09 +00:00
Treehugger Robot
fb1cebd7f9
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev
2023-05-08 10:25:06 +00:00
Angela Wang
8341fad6bf
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e am: 07ee2d859d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I70cc5f8eca57b243fde998bd1ce4e0d0b8075b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:58:35 +00:00
Angela Wang
87c42f29b0
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: f676c35f02 am: afe6a6388b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: Ic4b511e26cc6d3c5b401addec8bf6a408e882f2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:49:02 +00:00
Angela Wang
37301c7e72
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e am: 3716e194b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: Ia51ee15c9ea0add3538c7a78a6995bba4e88ffbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:48:54 +00:00
Angela Wang
afe6a6388b
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: f676c35f02
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: Iad821e17698321a88b6464fc0693b340d7141748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:15:58 +00:00
Angela Wang
07ee2d859d
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: Ibfdba3482f10fd329b039449a006e3bf4ef0bc1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:15:23 +00:00
Angela Wang
3716e194b1
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5 am: b03509284e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: Ibbb77dba4c77c09f2f6deb2db4bafefa82ed151f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 09:11:21 +00:00
Angela Wang
b03509284e
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I3e48ca3c397b530d8158d2e012d6a4867976b2d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 08:33:26 +00:00
Angela Wang
f676c35f02
Merge "Hides Flash Notifications illustration on tablet" into udc-dev am: 1113d5e9b5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23012482
Change-Id: I80b2e6a7bbe73212482521e5810430b9dcd0252f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 08:29:26 +00:00
ykhung
f31c8a477f
Fix the battery string incorrect spelling
...
Fix: 281473201
Test: presubmit
Change-Id: I9e4eb7f6c18918620a5e12680a30a5ba8bc7aa42
2023-05-08 16:10:27 +08:00
Charles Chen
0eeb5c9ccb
Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: 492530af2d am: 2bc77140bb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416
Change-Id: Ibd9132d3c38984854c147376683ae999480b8763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 07:52:35 +00:00
Charles Chen
11534c33c9
Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: b67f9c939d am: 8ad361f548
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416
Change-Id: Ideb4fd1846b5f57d36608610eb202103280ab33e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 07:47:38 +00:00
Charles Chen
38576cb446
Merge "Revert^2 Disable Settings large-screen optimization" into udc-dev am: f22d51b5f6 am: 492530af2d am: 4a048e404a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23036416
Change-Id: Ic1c823416b52ca853e94fe75c7ab3406b4d3f194
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 07:47:11 +00:00
Angela Wang
1113d5e9b5
Merge "Hides Flash Notifications illustration on tablet" into udc-dev
2023-05-08 07:46:55 +00:00
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