PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,100 Commits 1 Branch 0 Tags
e98a5a99323bee0a55e5895654dd5422e03fb79c
Commit Graph

80100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
android-build-team Robot
afca31b5dd Merge cherrypicks of [12952231, 12952640, 12952469, 12952586, 12952232, 12952587, 12952588, 12952589, 12952107, 12952470, 12952641] into rvc-qpr1-release 
Change-Id: If730b967cbab1c4993bcca0a99328dce10eb802b
 2020-10-30 01:46:39 +00:00
SongFerngWang
78b33b3824 To fix bug, summary is wrong if nr_enabled_bool=false 
The carrier config nr_enabled_bool is false, preferred network mode
should hide 5G UI. This bug is that the summary show 5G item when
nr_enabled_bool is false.
Solution: if nr_enabled_bool is false, it checks capability and then
removes 5G capability of network mode.

Bug: 170460943
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest   (PASS)
Change-Id: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
(cherry picked from commit 706036e5b3)
 2020-10-30 01:45:55 +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
9d508e3fdd Merge "Method name update" am: 35a02a1c92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12934207

Change-Id: I150383d4d3169604d831d34b518ad5385a674cd6
 2020-10-29 16:02:38 +00:00
Julia Reynolds
35a02a1c92 Merge "Method name update" 2020-10-29 15:24:06 +00:00
TreeHugger Robot
1f1b48bf2c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 9d3939f442 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic21108b316861cdbf4c5dd0b9d403acf156df974
 2020-10-29 10:52:30 +00:00
TreeHugger Robot
9d3939f442 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-10-29 10:40:39 +00:00
TreeHugger Robot
994f405137 Merge "Tweak the margin and corner of search bar" am: 3369c962f9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12905995

Change-Id: Ied6ea9c1fe550797a5760f6eb4291411dd8282ac
 2020-10-29 09:24:22 +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
Chloris Kuo
f64ce9e5e4 Add flag to reset notification channel importance 
Add a button in development option to unlock user previously changed
notification importance and allow NAS to change the importance

Test: make RunSettingsRoboTests
Change-Id: I55b5349d6a17a383888c59b9126832c2fb8c58a0
 2020-10-28 19:46:46 -07:00
Evan Laird
c17cf8769d 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 22:26:43 +00:00
TreeHugger Robot
3bbe016b32 Merge "Use ColorMatrixColorFilter in batterymeterview" am: 6f5b308d54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12921796

Change-Id: Id66cd9666d1a83a1c09a7c58c8b808ee80d81f10
 2020-10-28 21:15:15 +00: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
b4f69a98f0 Merge "Rename panic gesture to emergency gesture in Settings" am: 005b47249e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12932815

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

Change-Id: I39e65ed4d7d953af5364bba66759540a177f01f7
 2020-10-28 14:34:49 +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
dcdf15592b Merge "Fix review comments location_time_zone_detection" am: be3b9ffeaa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12918184

Change-Id: Ide3d7b6f7ab5a265d0a004563a911e435649d013
 2020-10-28 10:01:31 +00:00
Neil Fuller
be3b9ffeaa Merge "Fix review comments location_time_zone_detection" 2020-10-28 09:38:33 +00:00
Jeremy Goldman
f78b41a855 Merge "Fix flaky JUnit test" am: a14d7504bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12928115

Change-Id: I80e191897a6bbdf6ccf1bfc194fb2fd15b8235fa
 2020-10-28 09:03:06 +00:00
Jeremy Goldman
a14d7504bb Merge "Fix flaky JUnit test" 2020-10-28 08:34:51 +00:00
Treehugger Robot
6d9cbb112b Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 am: b50fba15b3 am: 15c5be7deb am: 548a4201a8 am: f07862473b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: I8bea679bf18e10c1305273350fd8b21c66bad95c
 2020-10-28 08:02:17 +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
Jeremy Goldman
fb098a2883 Merge "Mock SystemProperties in CDMA JUnit test" am: 1915699ddd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12922400

Change-Id: Ic553654016de56d5c1cbcf4b606c0f83b2ae420c
 2020-10-28 02:44:41 +00:00
Jeremy Goldman
1915699ddd Merge "Mock SystemProperties in CDMA JUnit test" 2020-10-28 01:53:04 +00:00
Julia Reynolds
992ca635c8 Method name update 
Test: make
Bug: 170705349
Change-Id: I83037d8eddaf62b542c79f1283f477d59f0dc6a8
 2020-10-27 20:02:07 -04:00
Neil Fuller
1affbfff83 Fix review comments location_time_zone_detection 
Fix review comments for location_time_zone_detection.xml and associated
classes from http://ag/12792958.

Bug: 152746236
Test: Manual: build / boot / toggle switch in SettingsUI / inspect output of adb shell dumpsys time_zone_detector
Test: Manual: build / boot / install TestDPC / toggle switch in work profile in SettingsUI / inspect output of adb shell dumpsys time_zone_detector
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.location.TimeZoneDetectionPreferenceControllerTest"
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.location.LocationTimeZoneDetectionPreferenceControllerTest"
Test: m -j30 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.location.TimeZoneDetectionSettingsTest"
Change-Id: I641f312cd63359f45664a93e009e5a975dbd6485
 2020-10-27 20:34:15 +00:00
Fan Zhang
f797a48af6 Rename panic gesture to emergency gesture in Settings 
Bug: 171589858
Test: rebuild
Change-Id: I23847db82a397bdcd61501758e3ef66a4f088e22
 2020-10-27 12:46:41 -07:00
Bill Yi
1750434f9b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 494ad6ca52 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1389cfdeeb98890ba7504ef38484777c5de4365
 2020-10-27 15:46:49 +00:00
George Chang
13f1c1249d Support RTL mode in payment option 
Bug: 156770848
Test: right-aligned under RTL mode
Change-Id: I01879056bbac08da0856f35012c8c8456328071c
 2020-10-27 11:49:33 +00:00
Bill Yi
494ad6ca52 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic336cf7344a62933fa3757d8404847b67ee9ba23
 2020-10-27 11:03:27 +00:00
Jeremy Goldman
1d068385c6 Mock SystemProperties in CDMA JUnit test 
Bug: 170608563
Test: atest -c CdmaSubscriptionPreferenceControllerTest
Change-Id: Ibeca5e508d8277a9b84e26829e085c43ce7c26cc
 2020-10-27 09:50:42 +00:00
LuK1337
c6b9c9fa86 Settings: Set preference controller for all VideoPreference widget usages 
Fixes blank VideoPreference for settings with missing media.

Test: manual, open quickly open camera or other affected prefs
Change-Id: I5d4ffbcaa9fa1a344bb66abe53cc01e7be5e07b2
 2020-10-26 23:10:11 +00:00