Commit Graph

34445 Commits

Author SHA1 Message Date
Amit Mahajan
7e09d39dd9 Merge "Fix mvno match data is incorrect for APNs" am: a604afe5de am: 33e9e31a3d
am: 9df297d566

Change-Id: I152d6451b5da34880b476e15fe7d6ce95a3fe0b4
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

Change-Id: I5cae77d8f81a07ad6e10901a2f4b51ae700c6189
2017-03-30 22:08:12 +00:00
Amit Mahajan
33e9e31a3d Merge "Fix mvno match data is incorrect for APNs"
am: a604afe5de

Change-Id: Id63da4e2b0c9ce5b2dfca567663fe8b736126bca
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
Bartosz Fabianowski
103a72a9eb Merge "Remove android:visibility attributes from Preferences" into oc-dev
am: b9f570ff44

Change-Id: I14c2b9e37201e478e28fba96494bee807134b32c
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
659c66a3ca Merge "Add link speed to Wifi details page." into oc-dev
am: 0df5281fe6

Change-Id: Ibcd26de73f4b859661ad976066cc7dc40ed45b97
2017-03-30 18:23:46 +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

Change-Id: I3f35dda59aaec348998dc86c2f7b7874917c6719
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
a0e34f020a Merge "VPN: uncheck lockdown if always-on is off" into oc-dev
am: 73455096d7

Change-Id: Idb17fffd05797c2c54bd823f2bcd6743b2d640fc
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
ab315ddb4b Merge "Update string for battery main page" into oc-dev
am: dd0e0b4506

Change-Id: I1eb0d3cf8859fe9c82d18a799312fe378319ad5a
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
64142d2f7a Merge "Reserve full indexing for SearchFragment" into oc-dev
am: 1261a679bf

Change-Id: Ia08fd77a634efd19a13982f1c4f89501e6a24c4f
2017-03-30 16:51:04 +00:00
Julia Reynolds
4be53f45ca Merge "Redirect zen mode suggestion" into oc-dev
am: 42b16f2f08

Change-Id: I330f11ba0a09de72ee24adacccb7a18ab2e2d613
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
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
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
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
92547f4b39 Merge "Import translations. DO NOT MERGE" into oc-dev
am: a53f8a9128  -s ours

Change-Id: I98c71241176416c95e810bc5e4b57e6150173dde
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
f18b5b3b05 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev
am: 1c087983d8

Change-Id: I2c4b84b472085c02fcd68208ca7fdc1e2ffa165c
2017-03-30 01:21:31 +00:00
Lei Yu
716101dfca Merge "Hide Wifi and Systemui in settings main page" into oc-dev
am: ae179f182f

Change-Id: Ib5df3df7e9c86a23149496cf4672ac696ff8eb74
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

Change-Id: Iebc74d977b081d45bd8b9220b941c62851e2acaa
2017-03-30 01:18:01 +00:00
TreeHugger Robot
1c087983d8 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" into oc-dev 2017-03-30 01:17:24 +00:00
Lei Yu
ae179f182f Merge "Hide Wifi and Systemui in settings main page" into oc-dev 2017-03-30 01:14:36 +00:00
Lei Yu
b2e213d551 Merge "Add summary for categories in battery advanced page" into oc-dev 2017-03-30 01:14:25 +00:00
Matthew Fritze
8a42b074a7 Reserve full indexing for SearchFragment
Full Index should only be accessible from Search Fragment,
and when only full index should declare a locale to be
indexed.

Test: make RunSettingsRoboTests
Fixes: 36656637
Change-Id: Ie673067118ac6b184570e116ea24a169be027053
2017-03-29 23:55:48 +00:00
Stephen Chen
f5d1327e2a Do not show progress bar when disabling wifi.
Bug: 34286786
Test: make, test on device.
Change-Id: I109ac05ce3565abc3d80ecec2879c2f7c8bc1724
2017-03-29 16:54:22 -07:00
Bill Yi
6e9d48b8ac Import translations. DO NOT MERGE
Change-Id: Ibb35af37750b62e22f828448b8230dc67b2de5c2
Auto-generated-cl: translation import
2017-03-29 16:33:00 -07:00
Stephen Chen
c6453a5bca Add link speed to Wifi details page.
Also make detail items unselectable.

Bug: 36444504
Test: make RunSettingsRoboTests
Change-Id: I393a3a25c8c036da1df1dc2788accfecb3563e14
2017-03-29 16:28:08 -07:00
Lei Yu
311593a89b Merge "Create Controller for app buttons" into oc-dev
am: 88b57826f5

Change-Id: I62b837278d68fafe5bbe7faaa968fda18a5c9453
2017-03-29 23:18:45 +00:00
Lei Yu
88b57826f5 Merge "Create Controller for app buttons" into oc-dev 2017-03-29 23:16:29 +00:00
Pavlin Radoslavov
5b1e4a2705 Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()
This API can be used to enable the optional codecs, or disable them
and use only the mandatory SBC.
Internally, it is implemented by raising the SBC priority to
highest (so SBC will be used/selected), or reducing the SBC priority
to its default value (lowest).

Test: A2DP streaming and enabling/disabling/selecting optional codecs
Bug: 35873828
Change-Id: I6e3144ff93bfc289fb25f4961fc00f39e8222290
(cherry picked from commit b0d8cdf8f8)
2017-03-29 16:01:00 -07:00
Pavlin Radoslavov
d246b714d0 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: eeabd6b463 am: bc9c1d0eb8
am: 30547ce3e8

Change-Id: I94706c37d395011fdc7c7d25d4a8426dc7af6d8f
2017-03-29 22:57:39 +00:00
Pavlin Radoslavov
30547ce3e8 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" am: eeabd6b463
am: bc9c1d0eb8

Change-Id: I3b89011d02f159d951b39ddc8d43cb17fbd00432
2017-03-29 22:51:53 +00:00
Pavlin Radoslavov
bc9c1d0eb8 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()"
am: eeabd6b463

Change-Id: I1ead14c5b587c9934fcd1fff450221cf83c16a3d
2017-03-29 22:47:40 +00:00
Christine Franks
58cbd30873 Merge "Disable default indicator for night display" into oc-dev
am: 231ed14e46

Change-Id: Ibf1034bf8edff6ad54a10c4d46b8740bbe685dea
2017-03-29 22:45:13 +00:00
Christine Franks
231ed14e46 Merge "Disable default indicator for night display" into oc-dev 2017-03-29 22:41:41 +00:00
Treehugger Robot
eeabd6b463 Merge "Add new internal API: enableOptionalCodecs()/disableOptionalCodecs()" 2017-03-29 22:41:14 +00:00
Stephen Chen
180810d00c Merge "Connect immediately after pressing on previously connected saved networks." into oc-dev
am: 31170fb629

Change-Id: Iee3dace687af34d3a1f75e9f201a38135c3f7997
2017-03-29 21:06:55 +00:00
TreeHugger Robot
31170fb629 Merge "Connect immediately after pressing on previously connected saved networks." into oc-dev 2017-03-29 21:00:56 +00:00
Peter Qiu
ae727fbb73 wifi: managed Passpoint configurations in "Saved Networks" page
Instead of going through WifiTracker to retrieve saved network
configurations (including both WiFi networks and Passpoint provider
configurations), use the WifiManager's APIs to retrieve the
configurations directly, to avoid any unnecessary complexities.

Also update to use the appropriate APIs for configuration removal
based on the configuration type.

Bug: 34207710
Test: manual test by removing a Passpoint configuration from
      "Saved Networks" page.

Change-Id: I549cc484d8825b6c38895428c1b7941390bb5f1f
2017-03-29 13:57:32 -07:00
jackqdyulei
b73e0d3f51 Update string for battery main page
Bug: 36576021
Test: Build
Change-Id: I60c43868dd54bfaf75648a9ac70a3ff5815180b6
(cherry picked from commit 630a8c054b)
2017-03-29 20:53:25 +00:00