Commit Graph

103248 Commits

Author SHA1 Message Date
Jason Hsu
b5b53be007 Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f am: 0465a872ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126

Change-Id: I42c3fd4eb8e1c8a321fd080fb6166ae4177ba3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 09:59:19 +00:00
Edgar Wang
0d4e918d0a Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19 am: e1c20560d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789

Change-Id: I78a3f62c7a6ae65e1988c7fef56c1f8b5a69594f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 09:58:52 +00:00
Edgar Wang
602c65616e Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19 am: 3661a62e80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789

Change-Id: I364fdad22885d0f78a83a6beda513c1b77729cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 09:57:50 +00:00
danielwbhuang
a5ef37752b [Panlingual] Unit test for onLocaleSelected
Add unit test.

Bug: 224724840
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppLocalePickerActivityTest
Change-Id: Iabbf84d58d5c325b15d960d63aeda0f7ca7af00b
2022-05-04 17:51:01 +08:00
Chaohui Wang
c2ff0c7b74 Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791

Change-Id: I0c1cc0c3dce818db23d6de7dbb1b99445aebae72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 09:02:04 +00:00
Jason Hsu
f754ec4926 Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126

Change-Id: I6e4aed7dd26965353730339420a7b7fc5bdedbab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 09:00:56 +00:00
Chaohui Wang
5f99fad806 Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791

Change-Id: I3f40513425cd4023139e93cad954caa93979011e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 09:00:07 +00:00
Jason Hsu
0465a872ae Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev am: c53c5a906f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090126

Change-Id: I298b3a3bc9950bb1b86ad0425d2e7986f679e1b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 08:59:23 +00:00
Edgar Wang
e1c20560d4 Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789

Change-Id: I5e9822ac867c84f31928eb8c3835adc666ce6b16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 08:58:38 +00:00
Edgar Wang
3661a62e80 Merge "Adjust profile category padding in factory reset page." into tm-dev am: 1098684b19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090789

Change-Id: Ie3555d9cda90495129c8f916a0ed2380b043485c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 08:58:21 +00:00
Chaohui Wang
22cda47705 Merge "Fix a11y label for LE Audio Battery" into tm-dev 2022-05-04 08:28:00 +00:00
Jason Hsu
c53c5a906f Merge "Save user's option when clicking 'Change setting' in triple-tap warning dialog" into tm-dev 2022-05-04 08:03:58 +00:00
Edgar Wang
1098684b19 Merge "Adjust profile category padding in factory reset page." into tm-dev 2022-05-04 07:39:53 +00:00
Automerger Merge Worker
d5f1a92b20 Merge "Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09 am: f22dfd7dc5" into tm-d1-dev-plus-aosp 2022-05-04 07:09:42 +00:00
Chaohui Wang
207de8e77e Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09 am: f22dfd7dc5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785

Change-Id: I5d06cd52d4f52e5e3272ff279a3cec60e878e847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 07:09:40 +00:00
Chaohui Wang
16fcd82ba9 Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09 am: e5c954ceb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785

Change-Id: I39be83e8e499f22a7caad3587bf69c7ea67a01b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 07:09:38 +00:00
YK Hung
fd726e1fcb Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435 am: 475ea0e01e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824

Change-Id: Id5bed5965fb10e3fc61ce3c1519e53c831c9ae03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 07:09:33 +00:00
YK Hung
b0d2eefa2a Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435 am: 082c193751
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824

Change-Id: I1d83fd019e7cd6826d0a686ae04f4520c06c4865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 07:08:56 +00:00
Chaohui Wang
e5c954ceb3 Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785

Change-Id: I18cca83d0d7836df97668a14426588dfd9ce06a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:42:24 +00:00
YK Hung
082c193751 Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824

Change-Id: Ia40a2a689b005e2362909cc293573d89a3f42639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:42:17 +00:00
Chaohui Wang
f22dfd7dc5 Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev am: 122d28ea09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090785

Change-Id: Ic8695350f0acf62ffa788cc7e29435099011b128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:41:06 +00:00
YK Hung
475ea0e01e Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev am: eb4acf8435
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158824

Change-Id: I5c0f83ed5365e8abe4a2404348dc0293674df822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:40:57 +00:00
Chaohui Wang
122d28ea09 Merge "Fix first item not a11y focusable in SimListDialog" into tm-dev 2022-05-04 06:37:25 +00:00
YK Hung
eb4acf8435 Merge "Add a mechanism to configure whether the summary should be set or not" into tm-dev 2022-05-04 06:19:43 +00:00
Chaohui Wang
ca4920090f Fix a11y label for LE Audio Battery
Before fix, "Left" & "Right" are in the same LinearLayout, not grouped
with battery info.

After fix, "Left" & "100% battery" are grouped together.

Bug: 229042138
Test: manual test when Talkback enabled
Change-Id: Ieb35ef992f62040f14ed878515d63f6edb2559f6
2022-05-04 14:17:26 +08:00
TreeHugger Robot
928e18a669 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: c158bb54eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I9e12288335646d6b2a64ab60ebd5f13b713dbdec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 06:00:25 +00:00
TreeHugger Robot
c158bb54eb Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I1a2ddc08bb84dee2617aefcb96a6a16db335f106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 05:17:17 +00:00
Automerger Merge Worker
74d860ddfb Merge "Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: af3385fd0c" into tm-d1-dev-plus-aosp 2022-05-04 04:51:52 +00:00
PETER LIANG
00bf715c6d Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: af3385fd0c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Ib5eef86c2ccf28ddcf48361692a24ce165c67e77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:49 +00:00
TreeHugger Robot
a949b54610 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913 am: 680e9f0a0f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: Ifddf447db14dcafdaed421728bc6fd12b4e0ceab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:46 +00:00
PETER LIANG
867c92b0e9 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d am: e07c557ed6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: I09bcf12fc13e6936aa6b035650ccf2509a3d6da7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:40 +00:00
Stanley Wang
e5247fa06a Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 766828b6f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: If19f76d5569105a23f9839876853e077b89fc166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:25 +00:00
TreeHugger Robot
680e9f0a0f Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev am: 756ed72913
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18087628

Change-Id: I80db9f0bda301b4f1b8d9e309e970ca7ba05f93b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:24 +00:00
Stanley Wang
2559f546b8 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca am: 99c08f3167
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I0e54eb4ca589c880b5c2b3bbd7bb5b6316bcb965
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:51:15 +00:00
TreeHugger Robot
756ed72913 Merge "Fix can't select the [USB Tethering] item in [Developer Options]" into tm-dev 2022-05-04 04:47:44 +00:00
Neil Fuller
4c44d26387 Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8 am: 32a00bf719
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: I6bdcf999c359ec062498476aedeb4c6ed7260922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:41:53 +00:00
PETER LIANG
e07c557ed6 Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: I1b585ea03e075873011320f175a6cc48a18d7526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:15:09 +00:00
PETER LIANG
af3385fd0c Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev am: 3ba4d5876d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090784

Change-Id: Ibcd1173ba5322d9ea9290e5ce232a62004d64ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:13:42 +00:00
PETER LIANG
3ba4d5876d Merge "Fix that ripple effect of level buttons for adjusting font/display size doesn't fit the shape." into tm-dev 2022-05-04 04:10:05 +00:00
Stanley Wang
766828b6f5 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I22b633d74bca78f1e0816b8b41d96a39e6c71c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:07:10 +00:00
Stanley Wang
99c08f3167 Merge "Update the title of Model page" into tm-dev am: 32fa5502ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18137023

Change-Id: I54136d376ce65122dcee68571be5f423992eff90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:05:45 +00:00
Neil Fuller
32a00bf719 Merge "Capitalize TZ display name strings" am: 6a44151bc1 am: 3bb5fc5da8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2055886

Change-Id: Id446433bafe4517f4822abdd1c49bfde99422a40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 04:04:52 +00:00
ykhung
3d1b6fd065 Add a mechanism to configure whether the summary should be set or not
Add a mechanism to customize whether the summary information in the
battery entry should be set or not. We can consider is as the extension
for the ag/18062824.

Bug: 220717612
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I3c21148d288f29ce65378f59f9086dab90c14a7b
2022-05-04 11:42:26 +08:00
Stanley Wang
32fa5502ca Merge "Update the title of Model page" into tm-dev 2022-05-04 03:15:45 +00:00
Automerger Merge Worker
506b83e90e Merge "Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964" into tm-d1-dev-plus-aosp 2022-05-04 02:55:38 +00:00
Chaohui Wang
785eeffb50 Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 179ab49964
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: I576fbaf5c1c1b9ce52663bc5cafbd7f3ef36d414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:55:28 +00:00
Chaohui Wang
da6cba31ce Merge "Add the jank detection to Settings sliders" into tm-dev am: b3db0000a6 am: 8456f1d5e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586

Change-Id: Iacfd67d8ea9db028ade85808a23dcd3922ed8605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:55:19 +00:00
TreeHugger Robot
aceb22d536 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: c5148a79ad -s ours am: f32c08af1d -s ours am: 8fdc4458ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I733a059f3c768b428b30f37f3bd76970d68a4162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:53:39 +00:00
Bill Yi
c9b4aede2b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 51fef3196f -s ours am: ee38ae11ca -s ours am: 16fe14a809 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49f55737ab561348ff8cf07e7ee6bba4c4958b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:53:31 +00:00
TreeHugger Robot
011098d8c4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 5cc53736d8 -s ours am: 93a954046f -s ours am: 8d0c594d9a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99354e81b48f43663eca100aecf5a6ffba349b04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 02:52:06 +00:00