Amin Shaikh
ad47cd05c7
Merge "Fix write wifi config to nfc." into oc-dev
...
am: 6889ac21ab
2017-03-31 00:03:48 +00:00
TreeHugger Robot
6889ac21ab
Merge "Fix write wifi config to nfc." into oc-dev
2017-03-30 23:59:34 +00:00
Wei Huang
d4cfac304a
Fix mvno match data is incorrect for APNs
...
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.
[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.
Bug: 34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
2017-03-30 15:54:14 -07:00
Amit Mahajan
82d5f1b85f
Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de am: 33e9e31a3d am: 9df297d566
...
am: 7e09d39dd9
2017-03-30 22:12:41 +00:00
Amit Mahajan
7e09d39dd9
Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de am: 33e9e31a3d
...
am: 9df297d566
2017-03-30 22:10:42 +00:00
Bill Yi
0ada77e203
Import translations. DO NOT MERGE
...
Change-Id: Ic117b670e525612d9f243eff4f151d9ee616d198
Auto-generated-cl: translation import
2017-03-30 15:09:46 -07:00
Amit Mahajan
9df297d566
Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de
...
am: 33e9e31a3d
2017-03-30 22:08:12 +00:00
Amit Mahajan
33e9e31a3d
Merge "Fix mvno match data is incorrect for APNs"
...
am: a604afe5de
2017-03-30 22:05:41 +00:00
Amit Mahajan
a604afe5de
Merge "Fix mvno match data is incorrect for APNs"
2017-03-30 21:59:35 +00:00
Amin Shaikh
f6c62a2e66
Fix write wifi config to nfc.
...
aog/340881 converts the NFC token hex string to lowercase instead of
uppercase. This change updates Settings to encode the password as a
lowercase hex string.
Bug: 35725168
Test: m RunSettingsRoboTests and manually testing writing GIN-2G to nfc
Change-Id: I85e991c4b8a3d7634dea7f945a23a2ef3d3fe448
2017-03-30 14:44:42 -07:00
Daniel Nishi
45c42b2c70
Lower case the first letter of storage type.
...
In the app details, the first letter of the storage type was
capitalized, causing an odd string of "X used in Internal storage."
Change-Id: Ibcac54259403f6d0f39df8fa2d3af10304a46057
Merged-In: I2b4f23ea1799dc1730fdab596e4a87a0cb673c68
Fixes: 36001265
Test: Settings robotest
2017-03-30 13:31:57 -07:00
Bartosz Fabianowski
ddf596da14
Merge "Remove android:visibility attributes from Preferences" into oc-dev am: b9f570ff44
...
am: 103a72a9eb
2017-03-30 20:10:54 +00:00
Bartosz Fabianowski
103a72a9eb
Merge "Remove android:visibility attributes from Preferences" into oc-dev
...
am: b9f570ff44
2017-03-30 20:06:57 +00:00
TreeHugger Robot
b9f570ff44
Merge "Remove android:visibility attributes from Preferences" into oc-dev
2017-03-30 19:57:01 +00:00
Stephen Chen
db45e51514
Merge "Add link speed to Wifi details page." into oc-dev am: 0df5281fe6
...
am: 659c66a3ca
2017-03-30 18:25:32 +00:00
Stephen Chen
659c66a3ca
Merge "Add link speed to Wifi details page." into oc-dev
...
am: 0df5281fe6
2017-03-30 18:23:46 +00:00
Stephen Chen
e280e2df66
Merge "Do not show progress bar when disabling wifi." into oc-dev am: 555d12b427
...
am: 69bc8c5632
2017-03-30 18:20:50 +00:00
TreeHugger Robot
0df5281fe6
Merge "Add link speed to Wifi details page." into oc-dev
2017-03-30 18:19:45 +00:00
Stephen Chen
69bc8c5632
Merge "Do not show progress bar when disabling wifi." into oc-dev
...
am: 555d12b427
2017-03-30 18:15:04 +00:00
TreeHugger Robot
555d12b427
Merge "Do not show progress bar when disabling wifi." into oc-dev
2017-03-30 18:08:46 +00:00
Robin Lee
1be80d2287
Merge "VPN: uncheck lockdown if always-on is off" into oc-dev am: 73455096d7
...
am: a0e34f020a
2017-03-30 18:06:45 +00:00
Robin Lee
a0e34f020a
Merge "VPN: uncheck lockdown if always-on is off" into oc-dev
...
am: 73455096d7
2017-03-30 18:03:56 +00:00
TreeHugger Robot
73455096d7
Merge "VPN: uncheck lockdown if always-on is off" into oc-dev
2017-03-30 17:57:16 +00:00
Lei Yu
b5a0fc4024
Merge "Update string for battery main page" into oc-dev am: dd0e0b4506
...
am: ab315ddb4b
2017-03-30 17:47:24 +00:00
Lei Yu
ab315ddb4b
Merge "Update string for battery main page" into oc-dev
...
am: dd0e0b4506
2017-03-30 17:32:45 +00:00
Lei Yu
dd0e0b4506
Merge "Update string for battery main page" into oc-dev
2017-03-30 17:20:41 +00:00
Matthew Fritze
6f2ca7a510
Merge "Reserve full indexing for SearchFragment" into oc-dev am: 1261a679bf
...
am: 64142d2f7a
2017-03-30 16:58:10 +00:00
Julia Reynolds
768c6b1ecd
Merge "Redirect zen mode suggestion" into oc-dev am: 42b16f2f08
...
am: 4be53f45ca
2017-03-30 16:57:56 +00:00
Matthew Fritze
64142d2f7a
Merge "Reserve full indexing for SearchFragment" into oc-dev
...
am: 1261a679bf
2017-03-30 16:51:04 +00:00
Julia Reynolds
4be53f45ca
Merge "Redirect zen mode suggestion" into oc-dev
...
am: 42b16f2f08
2017-03-30 16:50:50 +00:00
TreeHugger Robot
1261a679bf
Merge "Reserve full indexing for SearchFragment" into oc-dev
2017-03-30 16:48:53 +00:00
Julia Reynolds
42b16f2f08
Merge "Redirect zen mode suggestion" into oc-dev
2017-03-30 16:41:51 +00:00
Robin Lee
b8b310df17
VPN: uncheck lockdown if always-on is off
...
Change-Id: I00933e0c8567997d800f9f31f78c7b19922a52b8
Fix: 36713605
Test: make RunSettingsRoboTests -j30
2017-03-30 16:01:02 +00:00
tiansiming
8453fb3065
RejectedExecutionException in DataUsageLIst
...
RejectedPolicy throw Exception which will interrupt users
Bug: https://code.google.com/p/android/issues/detail?id=237575
Test: open as many online apps as possible and then open the DataUsageList
Change-Id: I2dabc6ee53cd0f27f59098328fe2a16172f71d0b
2017-03-30 23:22:02 +08:00
TreeHugger Robot
115b880063
Merge "Remove unused xml file."
2017-03-30 14:39:34 +00:00
Julia Reynolds
574c7cd62c
Redirect zen mode suggestion
...
Test: manual, click on DND suggestion
Bug: 36737163
Change-Id: I67f0ed801b05bb502af21952aa2050ae5e09df88
2017-03-30 10:29:02 -04:00
Bartosz Fabianowski
b836da263d
Device management info: Refer to current user, not primary user
...
The device management info page should show information about the
current user's policies, not the primary user's.
Bug: 32692748
Test: m RunSettingsRoboTests
Change-Id: I5d8afa7fae1c0f3a4da78b085365882827e6721b
2017-03-30 16:18:44 +02:00
Wei Huang
ec5109ab6d
Fix mvno match data is incorrect for APNs
...
[Cause of Defect]
When user editing an existing apn, ApnPreference won't pass
the subId to ApnEditor.
As a result, if use change the mvno type to 'imsi', ApnEditor
can NOT fetch the correct IMSI due to invalid subId.
[How To Fix]
Pass subId to ApnEditor, which is same as adding new APN.
Bug: 34646368
Test: manual - edited an existing apn
Change-Id: I79fe55ccdeb8dab0ffcc7dfb22ba680beb58b9cd
2017-03-30 22:48:17 +09:00
Niels Egberts
ecb613bd8d
Remove unused xml file.
...
Bug: 36741587
Test: mmma packages/apps/Settings
Change-Id: I35eee7fb442a1cdeb54d8a9f54426322c75e3f99
2017-03-30 11:06:37 +01:00
Bartosz Fabianowski
49a3c626fb
Remove android:visibility attributes from Preferences
...
The android:visibility attribute is not applicable to Preferences and
does nothing.
Bug: 32692748
Test: None
Change-Id: I9aa6c3df824b61f96466cc7de6c046870a46678c
(cherry picked from commit 28a03aeb48
2017-03-30 08:28:11 +00:00
Bartosz Fabianowski
578b02f33c
Keep EnterprisePrivacySettingsActivity always enabled
...
The existing code checks during Settings startup whether the device is
managed. If it is not, EnterprisePrivacySettingsActivity is disabled.
If the device then becomes managed, Settings will not notice until
the next restart, causing any attempt to launch this Activity via an
Intent to crash.
This CL changes things so that the Activity is always enabled but
simply does nothing when launched on a non-managed device.
Bug: 34122104
Test: Integration test coming in a separate CL
Change-Id: I0a1dfcb41b405d981309696d97678df6787b4f72
(cherry picked from commit 92d25fb5f3
2017-03-30 08:28:02 +00:00
Bill Yi
2b37b43821
Merge "Import translations. DO NOT MERGE" into oc-dev am: a53f8a9128 -s ours
...
am: 92547f4b39
2017-03-30 02:01:15 +00:00
Bill Yi
92547f4b39
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: a53f8a9128
2017-03-30 01:52:16 +00:00
TreeHugger Robot
a53f8a9128
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-03-30 01:39:02 +00:00
Pavlin Radoslavov
959eda9994
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev am: 1c087983d8
...
am: f18b5b3b05
2017-03-30 01:26:53 +00:00
Pavlin Radoslavov
f18b5b3b05
Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
...
am: 1c087983d8
2017-03-30 01:21:31 +00:00
Lei Yu
862a61468f
Merge "Hide Wifi and Systemui in settings main page" into oc-dev am: ae179f182f
...
am: 716101dfca
2017-03-30 01:20:37 +00:00
Lei Yu
482a343b36
Merge "Add summary for categories in battery advanced page" into oc-dev am: b2e213d551
...
am: 743cd6f142
2017-03-30 01:20:22 +00:00
Lei Yu
716101dfca
Merge "Hide Wifi and Systemui in settings main page" into oc-dev
...
am: ae179f182f
2017-03-30 01:18:15 +00:00
Lei Yu
743cd6f142
Merge "Add summary for categories in battery advanced page" into oc-dev
...
am: b2e213d551
2017-03-30 01:18:01 +00:00
