Commit Graph

78282 Commits

Author SHA1 Message Date
Tobias Thierer
05783b4e6d backup settings: Update OWNERS.
Refer to platform OWNERS + bug component.

Bug: 159055442
Test: Treehugger
Change-Id: I2fdbf98a8326285ef41482cc207ed9aa94e9a0f4
(cherry picked from commit bfe97711c99ee6654e3cc3c94bc504d3d2f49ec4)
2020-10-31 01:22:46 +00:00
TreeHugger Robot
d82945a317 [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: 5f5d754af2 -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: Iace9ffcdfcf8a6c9d302276c3be85c669400e7da
2020-10-30 17:23:42 +00:00
TreeHugger Robot
9a3e43cfec [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: 65dc2d6b82 -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: I0046ab090e09f9866efeb70b9dcbfd066a716728
2020-10-30 17:23:35 +00:00
Bill Yi
fbdc5de687 [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: 27e308d4f2 -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: I6f10527487fd005bdfbdd1eb4aee7fcec542c86c
2020-10-30 17:23:21 +00:00
Bill Yi
9c61a3a9f0 [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: fcbb855355 -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: I4c17574f2a8484771e602d1f33c222447b33c87e
2020-10-30 17:23:04 +00: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
af83b9897b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 025633bdd4 -s ours am: e0b0815077 -s ours am: ee1897125b -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: I6a575d9b26094546d4381a2771dec79e27152197
2020-10-30 16:40:12 +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
5f797e8b51 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a32714b730 -s ours am: d569989533 -s ours am: 2f386884df -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: Id39c93da13c8d1b36a1e30834cc7a373107035a5
2020-10-30 16:39:44 +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
Andrei Onea
b0a6dd680e Fix app compat dashboard from settings app
Fix an issue due to recent changes tha made the settings app
accidentally categorize non sdk gated changes as targetSdk > -1.

The recent changes made target sdk changes have a '>=' condition instead
of strictly '>', so address that issue as well.

Bug: 172043600
Test: open App Compatibility Changes option in Developer Options
Change-Id: Ic5ee203c5a82ac982164304e3ae399947a39e058
2020-10-30 16:38:08 +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
SongFerngWang
22e18a86cc [Testing] To migration NetworkScorerPickerPreferenceControllerTest
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. Add a function which loads the Settings Resource.

Diff: https://diff.googleplex.com/#key=81Ufa1AWkLAi
Bug: 172047348
Test: atest -c NetworkScorerPickerPreferenceControllerTest
Change-Id: I9c1a4f957b92ab572eadbd8a0804bdc83608230b
2020-10-30 13:34:22 +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
e886ab031e [automerger skipped] Merge "Hide 'View plan' button in data usage settings" am: 07f2c27cbf am: 94cabf8a02 am: d84135e91d -s ours am: a26e14c90b -s ours am: 5bf19dfa07 -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: I5ac60af26a4ccc3211bd063e80f4c4802e31dcc5
2020-10-30 04:58:50 +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
Yi Jiang
69a2722652 Merge "Hides Screen Attention setting on unsupported devices" am: f68e8e32ec
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12950439

Change-Id: Iad91335dfc2247c0ed40de30f364331cb609960a
2020-10-30 04:06:24 +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
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