PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,365 Commits 1 Branch 0 Tags
536cb60c656b62bf4a3b10c15a77e05709f7a288
Commit Graph

75365 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sarah Chin
536cb60c65 Update ICC lock API methods 
Test: atest TelephonyManagerTest
Bug: 171884262
Change-Id: Ia4ba222dfa7d7756a3675f75b3467d0265967516
 2020-11-06 14:58:24 -08:00
TreeHugger Robot
5f5d754af2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours am: 081fc9279b -s ours am: b81eb46545 -s ours am: c7b05589f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I39ffdb7958ef6b7d253badd4723b13a783cab104
 2020-10-30 16:51:40 +00:00
TreeHugger Robot
65dc2d6b82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours am: 081fc9279b -s ours am: 0585247398 -s ours am: 2bb6767c1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieef604e9751ab68e3883e0e30ece0bf7aef756ba
 2020-10-30 16:51:34 +00:00
Bill Yi
27e308d4f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours am: d1e8e10ff6 -s ours am: f17df9c272 -s ours am: 395e567cf2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d984a439fc9543967453aeecab085aa119ca25e
 2020-10-30 16:51:19 +00:00
Bill Yi
fcbb855355 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours am: d1e8e10ff6 -s ours am: 0ac3724dfd -s ours am: 38f8d96aed -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08100b97143cf5a1825647e29cc0caa77336a8bb
 2020-10-30 16:50:52 +00:00
TreeHugger Robot
c7b05589f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours am: 081fc9279b -s ours am: b81eb46545 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1ba3303b884192975aca3aeb869b30f473a5f30
 2020-10-30 16:40:49 +00:00
TreeHugger Robot
2bb6767c1d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours am: 081fc9279b -s ours am: 0585247398 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e306fcce233df23ca80f87cd5df8c384219c5d5
 2020-10-30 16:40:02 +00:00
Bill Yi
395e567cf2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours am: d1e8e10ff6 -s ours am: f17df9c272 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2aee91aec1ca77edbcc04d106976c4b428d536a7
 2020-10-30 16:39:47 +00:00
Bill Yi
38f8d96aed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours am: d1e8e10ff6 -s ours am: 0ac3724dfd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iac184fc7ca1f50872ab4044fe9c324f01d734afe
 2020-10-30 16:39:27 +00:00
TreeHugger Robot
0585247398 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours am: 081fc9279b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbf78891b3f771a13b461667adb8241cac4373ff
 2020-10-30 16:12:01 +00:00
Bill Yi
f17df9c272 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours am: d1e8e10ff6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I386528edee3c4a7fe71657bac29639c848a5dd87
 2020-10-30 16:11:50 +00:00
TreeHugger Robot
ee1897125b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours am: e0b0815077 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28e15f65e5bf57a29317a1e2ae2f238405ceb89e
 2020-10-30 16:11:41 +00:00
TreeHugger Robot
b81eb46545 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours am: 081fc9279b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iccebed366b0bd3e08c1e3f8886a1a8bee953c1d9
 2020-10-30 16:11:37 +00:00
Bill Yi
2f386884df [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours am: d569989533 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1853ec6d52d8492fab5da9d52e1c6949fb4854fb
 2020-10-30 16:11:36 +00:00
Bill Yi
0ac3724dfd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours am: d1e8e10ff6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5e9ac96bad9db5b20928e5c0f0eec22843f56742
 2020-10-30 16:11:32 +00:00
TreeHugger Robot
e0b0815077 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If79f23604f5792932b57b8604df466dabce63fa2
 2020-10-30 15:59:27 +00:00
Bill Yi
d569989533 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dc521f84f01574b3eb3c6e868dc0b1a18a0d6d7
 2020-10-30 15:59:21 +00:00
TreeHugger Robot
081fc9279b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib550c2733e1d19991b584193f697ddd1ed0e9398
 2020-10-30 15:59:13 +00:00
Bill Yi
d1e8e10ff6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3cc31af80be4d8713b8cd88601527358c1157877
 2020-10-30 15:59:03 +00:00
TreeHugger Robot
025633bdd4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev 2020-10-30 15:34:51 +00:00
Bill Yi
ad1862fff5 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2e893944fdf186bf1cfa3a66dd77a047e05a86a6
 2020-10-30 05:15:25 +00:00
Sarah Chin
5bf19dfa07 [automerger skipped] Merge "Hide 'View plan' button in data usage settings" am: 07f2c27cbf am: 94cabf8a02 am: d84135e91d -s ours am: a26e14c90b -s ours 
am skip reason: Change-Id Ieda020bfa692e9465d6297e50cf338deff91a8a9 with SHA-1 f3d7860c70 is in history

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

Change-Id: I177d313c832b0b02a01c361d7e3333a49554e375
 2020-10-30 04:40:25 +00:00
Bill Yi
a32714b730 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I18f71142db1259e005eb0b51ca44bdb4e69e5821
 2020-10-30 04:38:31 +00:00
Sarah Chin
a26e14c90b [automerger skipped] Merge "Hide 'View plan' button in data usage settings" am: 07f2c27cbf am: 94cabf8a02 am: d84135e91d -s ours 
am skip reason: Change-Id Ieda020bfa692e9465d6297e50cf338deff91a8a9 with SHA-1 f3d7860c70 is in history

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

Change-Id: I6ad1a973c3289ce3284a49a01e57dc0629fbf99b
 2020-10-30 03:59:53 +00:00
Yi Jiang
f68e8e32ec Merge "Hides Screen Attention setting on unsupported devices" 2020-10-30 03:45:34 +00:00
Sarah Chin
d84135e91d Merge "Hide 'View plan' button in data usage settings" am: 07f2c27cbf am: 94cabf8a02 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480638

Change-Id: I2026849d4e4b4d057ea1f1d399994faedf913e1c
 2020-10-30 03:35:16 +00:00
Sarah Chin
94cabf8a02 Merge "Hide 'View plan' button in data usage settings" am: 07f2c27cbf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480638

Change-Id: I851c0994ed2aa79148b2b22d1733256c845a50a9
 2020-10-30 03:24:46 +00:00
Sarah Chin
07f2c27cbf Merge "Hide 'View plan' button in data usage settings" 2020-10-30 02:48:14 +00:00
Sarah Chin
d6e4e9d8fe Hide 'View plan' button in data usage settings 
There are currently no callers of the setSubscriptionPlan() API that
have a MDP app set up. Remove the button when SubscriptionPlans are
defined, since it does nothing and causes confusion for users.

Test: manually verify button does not exist when a plan is defined
Test: make RunSettingsRoboTests
Bug: 169806315
Change-Id: Ieda020bfa692e9465d6297e50cf338deff91a8a9
Merged-In: Ieda020bfa692e9465d6297e50cf338deff91a8a9
 2020-10-29 16:36:28 -07:00
Yi Jiang
a56be2d614 Hides Screen Attention setting on unsupported devices 
Bug: 170971817
Test: make RunSettingsRoboTests
Change-Id: I8aa7882be9a1ae483e8e7500059a18859b20d42b
 2020-10-29 13:16:48 -07:00
Julia Reynolds
35a02a1c92 Merge "Method name update" 2020-10-29 15:24:06 +00:00
TreeHugger Robot
9d3939f442 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-29 10:40:39 +00:00
TreeHugger Robot
3369c962f9 Merge "Tweak the margin and corner of search bar" 2020-10-29 09:12:15 +00:00
Bill Yi
8bced056cc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icd976fee90544085cc9b7a8cdf898529983ea51c
 2020-10-28 20:23:54 -07:00
TreeHugger Robot
6f5b308d54 Merge "Use ColorMatrixColorFilter in batterymeterview" 2020-10-28 20:35:02 +00:00
Evan Laird
4393d200b6 Use ColorMatrixColorFilter in batterymeterview 
the old PorterDuff color filter didn't allow us to pass through the
drawable's alpha.

Test: manual
Bug: 162901879
Change-Id: I1ad7d9a0177c7a25d1c6a5a8437c27f60390f45e
 2020-10-28 14:21:30 -04:00
Fan Zhang
005b47249e Merge "Rename panic gesture to emergency gesture in Settings" 2020-10-28 17:02:21 +00:00
George Chang
de36a60bd5 Merge "Support RTL mode in payment option" am: 7e65d7f6fc am: ef4f13c936 am: 520d9af539 am: aeae2f7e69 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1476376

Change-Id: I57cf70a121e861036de82333ab8dba4195521edf
 2020-10-28 14:09:08 +00:00
George Chang
aeae2f7e69 Merge "Support RTL mode in payment option" am: 7e65d7f6fc am: ef4f13c936 am: 520d9af539 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1476376

Change-Id: I392d46da2898d65ffbe41381122ab19d30e9af80
 2020-10-28 13:47:15 +00:00
George Chang
520d9af539 Merge "Support RTL mode in payment option" am: 7e65d7f6fc am: ef4f13c936 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1476376

Change-Id: I7966cfb6f7e139575acdc0b3eb7c6166935175c4
 2020-10-28 13:32:21 +00:00
George Chang
ef4f13c936 Merge "Support RTL mode in payment option" am: 7e65d7f6fc 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1476376

Change-Id: Ibfb1960e19f913cff8f879beb3da011d60108aa3
 2020-10-28 13:16:12 +00:00
George Chang
7e65d7f6fc Merge "Support RTL mode in payment option" 2020-10-28 12:42:11 +00:00
Neil Fuller
be3b9ffeaa Merge "Fix review comments location_time_zone_detection" 2020-10-28 09:38:33 +00:00
Jeremy Goldman
a14d7504bb Merge "Fix flaky JUnit test" 2020-10-28 08:34:51 +00:00
Treehugger Robot
f07862473b Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 am: b50fba15b3 am: 15c5be7deb am: 548a4201a8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: Ie81fd135de3208b673aef4deaea93b7e983768e3
 2020-10-28 07:48:59 +00:00
Treehugger Robot
548a4201a8 Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 am: b50fba15b3 am: 15c5be7deb 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: I85c050785babcdc196539007d3d678b0b9fca3cc
 2020-10-28 07:18:07 +00:00
Treehugger Robot
15c5be7deb Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 am: b50fba15b3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: Iccc07e5d144297f5999f0ed324c0f2b0844e4c02
 2020-10-28 07:00:24 +00:00
Treehugger Robot
b50fba15b3 Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: Ief5693cd34838cec35e7e5c650752c3b4cdb9d02
 2020-10-28 06:28:27 +00:00
Treehugger Robot
4e04e32679 Merge "Settings: Set preference controller for all VideoPreference widget usages" 2020-10-28 06:05:41 +00:00
Jeremy Goldman
125301d590 Fix flaky JUnit test 
This test sometimes fails in PostSubmits because the background
thread which calls the verified class does not have time to execute
before the class is verified.

This creates a helper function to monitor background thread completion.

Test: atest -c AutoSelectPreferenceControllerTest
Change-Id: I6c320abd70fcb5fe823ec122fb0dac67174ecb4a
 2020-10-28 05:15:52 +00:00