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
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
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
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
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
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
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
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
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
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
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
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
Weng Su
8f8348dc7b
Fix the Wi-Fi detailed settings un-editable issue. am: f914e34d28
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12894947
Change-Id: I60460fb5f945eab4d70e28d47868d611b9c564da
2020-10-23 14:25:53 +00:00
Automerger Merge Worker
84e3413f34
[automerger skipped] Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master am: bab12d1aa2
-s ours am: 08d2eab4e5
-s ours
...
am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 17ba8166a3
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180
Change-Id: Idb369344a998f57035a5e49ffdbab5e0bb000cd3
2020-10-22 22:24:27 +00:00
Hall Liu
9146943bb5
Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70
am: 4af7d6a7d2
am: d51ee68578
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180
Change-Id: I9c1496152155d3db0bd4c29502e7d43f6335ee86
2020-10-22 22:22:47 +00:00
Automerger Merge Worker
08d2eab4e5
[automerger skipped] Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master am: bab12d1aa2
-s ours
...
am skip reason: Change-Id I7ebae37373d53fb2c59b6b546232dbddf77398d4 with SHA-1 17ba8166a3
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180
Change-Id: I6803f4fbde2b7ae9f6635ce4040f4d085900b56f
2020-10-22 21:51:48 +00:00
Hall Liu
d51ee68578
Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70
am: 4af7d6a7d2
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180
Change-Id: I6ad3c840463bcb070769e9d91b2671d09f359369
2020-10-22 21:49:15 +00:00
Automerger Merge Worker
bab12d1aa2
Merge "Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70" into stage-aosp-master
2020-10-22 21:35:15 +00:00
Hall Liu
5a5e0e021d
Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180
Change-Id: I31b5513de4f5f9985f44ce124e4f0eea83ec107f
2020-10-22 21:19:11 +00:00
Hall Liu
4af7d6a7d2
Merge "Replace TelephonyManager methods for mobile data" am: c2a4d3ec70
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1470180
Change-Id: I02440f0bc76eea3d66526e7c1d02343893603cab
2020-10-22 21:14:05 +00:00
Hall Liu
c2a4d3ec70
Merge "Replace TelephonyManager methods for mobile data"
2020-10-22 17:27:59 +00:00
Hall Liu
17ba8166a3
Replace TelephonyManager methods for mobile data
...
TelephonyManager had a minor refactor of some of the methods revolving
around mobile data. Change code in Settings to use the new ones instead.
Exempt-From-Owner-Approval: Cherry-picked from internal
Bug: 169367013
Test: existing unit tests, manual
Change-Id: I7ebae37373d53fb2c59b6b546232dbddf77398d4
Merged-In: I7ebae37373d53fb2c59b6b546232dbddf77398d4
2020-10-21 23:38:20 +00:00
Weng Su
f914e34d28
Fix the Wi-Fi detailed settings un-editable issue.
...
- The WifiEntry info might not be ready in early stage. (ex:
WifiEntry#canSetPrivacy())
- The Wi-Fi detailed setting listens to the WifiEntry callback to
refresh the preferences, it should first update the preference status to
be editable or not, and then display preferences to the UI.
- The privicy preference should be able to set back to selectable when
WifiEntry#canSetPrivicy() change from false to true.
Bug: 170148009
Test:
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiNetworkDetailsFragment2Test
make RunSettingsRoboTests
ROBOTEST_FILTER=WifiPrivacyPreferenceController2Test
Change-Id: I48ca060e6b468232f19c82e9de0ce4fce39cba7f
Merged-In: I567b2b80163631a01d165c0ac5c0aba392e014ef
2020-10-21 16:39:58 +00:00
SongFerng Wang
9493731935
Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev am: 3e5defe561
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12875667
Change-Id: I2b69a34d035e70cbc1bea9a2482be876eeabda66
2020-10-21 08:19:13 +00:00
SongFerng Wang
3e5defe561
Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev
2020-10-21 08:05:48 +00:00
Treehugger Robot
e3dd9644b6
Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b
am: 0a2c406023
am: d719de84c1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190
Change-Id: I3005a83ba8d27238d2fbd883d77b4a20432cabc6
2020-10-21 03:53:00 +00:00
Treehugger Robot
d719de84c1
Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b
am: 0a2c406023
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190
Change-Id: I91608590cc7b0255706d0ea4bdc896a778e72b8b
2020-10-21 03:21:48 +00:00
Treehugger Robot
0a2c406023
Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190
Change-Id: I195b2215ba250f7831de87d6b325560712fa8112
2020-10-21 02:52:54 +00:00
Treehugger Robot
21846b228b
Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING"
2020-10-21 02:40:55 +00:00
Treehugger Robot
f2f13ca90a
[automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f
-s ours am: bda0c67436
-s ours am: 9d867703c5
-s ours
...
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465940
Change-Id: I3886e4ba36d6361c60f65e28cde49fc7dd83cd1f
2020-10-20 20:18:23 +00:00
Treehugger Robot
9d867703c5
[automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f
-s ours am: bda0c67436
-s ours
...
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465940
Change-Id: Ie60eb5b5524b59ab0f8b2aa4079c08a685b02577
2020-10-20 19:34:05 +00:00
Treehugger Robot
bda0c67436
[automerger skipped] Merge "Merge redfin/bramble support." am: 7881b23f1f
-s ours
...
am skip reason: Change-Id I600c63a996b1684a2b801787d88974501062c073 with SHA-1 38747f76f3
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1465940
Change-Id: I70a4a5ebc491947ec7d9205d54301eb5dc28f4b9
2020-10-20 19:03:54 +00:00