Commit Graph

40221 Commits

Author SHA1 Message Date
Brad Ebinger
af845720f6 Merge "Add ims registration status" into stage-aosp-master 2017-09-11 19:42:37 +00:00
jackqdyulei
d8964a5735 Add OWNERS for folder nfc
Bug: 65294119
Test: Manual
Change-Id: I69af58183c5b89af96c1a8808665fa506a620012
2017-09-11 12:23:01 -07:00
Amit Mahajan
6f0a5d8665 Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09 am: 6ca28e8362 am: 154779b6af
am: e886c7c2c1

Change-Id: I13b51a07246b83e1030f6d35b275bb9ea786e28a
2017-09-11 19:13:42 +00:00
jackqdyulei
7854b554c8 Merge "Make system item has a consistent name." into oc-mr1-dev am: 9a3cb9b835
am: 52a2d32a37

Change-Id: I420581233b77c88772058730e8535c8d72b2cad5
2017-09-11 19:13:00 +00:00
Amit Mahajan
e886c7c2c1 Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09 am: 6ca28e8362
am: 154779b6af

Change-Id: I90715e84699ac52ce727782917c7a0c75a40e843
2017-09-11 18:01:35 +00:00
jackqdyulei
52a2d32a37 Merge "Make system item has a consistent name." into oc-mr1-dev
am: 9a3cb9b835

Change-Id: I928f4266130d488476aadd6dd61a3ce22c579aa2
2017-09-11 17:53:43 +00:00
Amit Mahajan
154779b6af Merge "Change to disable mvno data field in ApnEditor if needed." am: c2c0edff09
am: 6ca28e8362

Change-Id: I7e14539d3b22918c8d4a1aa4d41ba96afe88ca1c
2017-09-11 17:51:18 +00:00
Maurice Lam
c11a2f0745 Merge "Don't default to PIN on non FBE devices" 2017-09-11 17:41:47 +00:00
Amit Mahajan
6ca28e8362 Merge "Change to disable mvno data field in ApnEditor if needed."
am: c2c0edff09

Change-Id: If53f719245876dda59b220a9b066f30f1c1e0fbc
2017-09-11 17:37:55 +00:00
TreeHugger Robot
9a3cb9b835 Merge "Make system item has a consistent name." into oc-mr1-dev 2017-09-11 17:33:09 +00:00
Treehugger Robot
c2c0edff09 Merge "Change to disable mvno data field in ApnEditor if needed." 2017-09-11 17:21:07 +00:00
Antony Sargent
9be8c3fbfe Fix focus behavior of ValidatedEditTextPreference
The bug report was that the cursor is set to the beginning of the
EditText for wifi hotspot password field, instead of at the end (or
having the entire field selected). This fix makes it so that all
ValidatedEditTextPreference's will put the cursor at the end of the
EditText.

Bug: 65413206
Test: make RunSettingsRoboTests
Change-Id: I23f3bb1b3f1b49b2f193c0ae2e103eae5c1a1019
2017-09-11 10:12:05 -07:00
Amit Mahajan
ad8eba3097 Change to disable mvno data field in ApnEditor if needed.
Test: manual
Bug: 65243262
Change-Id: I4b3dec6d9dc7fecf0b0a8131dccc349c7daffe48
2017-09-11 09:08:49 -07:00
Erik Kline
c8e912e5c4 Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev am: 1b62d99433
am: 775807f422

Change-Id: I55fbd611fee9f17215412a76b480cdee96f62b32
2017-09-11 05:04:28 +00:00
Erik Kline
775807f422 Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev
am: 1b62d99433

Change-Id: If15181d557e9abce75111a6e1fff4e12586d7dbc
2017-09-11 05:00:34 +00:00
TreeHugger Robot
1b62d99433 Merge "Include IPv6 DNS servers in wifi details" into oc-mr1-dev 2017-09-11 04:56:28 +00:00
Erik Kline
9adc588749 Include IPv6 DNS servers in wifi details
Test: as follows
    - built
    - flashed
    - booted
    - export ROBOTEST_FILTER=WifiDetailPreferenceControllerTest \
          make -j RunSettingsRoboTests
      RunSettingsRoboTests:
      RunSettingsRoboTests: Time: 19.821
      RunSettingsRoboTests:
      RunSettingsRoboTests: OK (37 tests)
      RunSettingsRoboTests:
    - make -j RunSettingsRoboTests
      RunSettingsRoboTests: ...........................
      RunSettingsRoboTests: Time: 424.847
      RunSettingsRoboTests:
      RunSettingsRoboTests: OK (2250 tests)
      RunSettingsRoboTests:

Bug: 65037256
Bug: 65467586

Change-Id: Icd3d09aa35c04101c41e2521b48e64f28f69ae29
2017-09-11 11:24:45 +09:00
Fan Zhang
4c26da9e13 Fork a new developer options page.
- Create a new activity/fragment and add it to manifest
- Mark old activity/fragment deprecated
- Enable/disable the new activity based on FeatureFlag
- Initial skeleton code for new fragment

Bug: 65522852
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=DevelopmentSettingsDashboardFragmentTest
Change-Id: Ib1395693f8b6f61d4726573a9ea841ea53cf207b
2017-09-10 15:02:51 -07:00
TreeHugger Robot
14e4964be0 Merge "Add FakeFeatureFactory.setupForTest" 2017-09-08 22:30:05 +00:00
Fan Zhang
1f92faad27 Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev am: 90f9398f4e
am: ed71e21541

Change-Id: Ic2f5d6c35ac8bb7a14d1949be53beb6b6bf4cd16
2017-09-08 22:23:19 +00:00
Daniel Nishi
56e04db460 Merge "Re-add the block of text explaining the feature." into oc-mr1-dev am: 3315f38c3f
am: df0e716b43

Change-Id: Ibe767b5bd21ed75ea188a1a6561aa974edd2b449
2017-09-08 22:22:32 +00:00
Fan Zhang
ed71e21541 Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev
am: 90f9398f4e

Change-Id: Idb6dabf0d06440f3a2aecc2f4488bb98859f2eae
2017-09-08 22:04:52 +00:00
Daniel Nishi
df0e716b43 Merge "Re-add the block of text explaining the feature." into oc-mr1-dev
am: 3315f38c3f

Change-Id: I7f8bfe688afc95a184fc6499b95a3c733cb9c681
2017-09-08 22:04:12 +00:00
TreeHugger Robot
90f9398f4e Merge "Don't attempt to tint icon if icon is not available" into oc-mr1-dev 2017-09-08 21:42:32 +00:00
Daniel Nishi
3315f38c3f Merge "Re-add the block of text explaining the feature." into oc-mr1-dev 2017-09-08 21:39:16 +00:00
Eric Schwarzenbach
5a7e46dd80 Add modify button to WifiNetworkDetailsFragment.
Adds pencil icon to Wifi Detail action bar to modify the network.
Modifies package/public visibility to allow the detail package to
use the WifiDialog. Listens for changes in WifiConfigurations to
propagate changes to the UI in WifiNetworkDetailsFragment.

Changes WifiNetworkDetail preference launch to conform to pattern
of other Settings apps. Removes unused WifiDetailActionBarObserver.

Bug: 36483704, 37082355
Test: make -j40 RunSettingsRoboTests
Change-Id: Ie9dc1892eaefdfad4a6bd7040bfc5dbf6236cfb4
2017-09-08 13:39:22 -07:00
Maurice Lam
d78ea6af4a Don't default to PIN on non FBE devices
So that EncryptionInterstitial is shown as part of the flow

Test: cd tests/robotests && mma
Bug: 65192141
Change-Id: I13e8b9059aae39cef2a8509f9f0eee1cd0808220
2017-09-08 13:31:58 -07:00
Maurice Lam
563af1cda9 Add FakeFeatureFactory.setupForTest
In AssisGestureSettingsTest, FakeFeatureFactory was used but was
missing a setupForTest call.

Test: cd tests/robotests && \
      ROBOTEST_FILTER=AssistGestureSettingsTest mma

Change-Id: Ie78232d854aee00c7969a3d2dc148354be7de484
2017-09-08 13:08:03 -07:00
Maurice Lam
4dec4a0730 Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev am: 40e284b196
am: f26fe2763a  -s ours

Change-Id: I1ec02f7ae6a26686a173553d72f1b5b3bbc8167a
2017-09-08 20:04:19 +00:00
Maurice Lam
f26fe2763a Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev
am: 40e284b196

Change-Id: Ica634ce9776b0b0c30bfb49223a4d1d5fc5398ad
2017-09-08 19:56:09 +00:00
Andrew Scull
67d24dce72 Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev am: 0bac26b6cd
am: e1f4703dbe

Change-Id: I965bfe2e5a3be1c078c4769d2aaaa07fd92d1b1e
2017-09-08 19:51:09 +00:00
Maurice Lam
40e284b196 Merge "Don't default to PIN on non FBE devices. DO NOT MERGE" into oc-mr1-dev 2017-09-08 19:50:52 +00:00
Andrew Scull
e1f4703dbe Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev
am: 0bac26b6cd

Change-Id: I30996559ac5166d4ed2cf59688239effe335a305
2017-09-08 19:33:34 +00:00
TreeHugger Robot
0bac26b6cd Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." into oc-mr1-dev 2017-09-08 19:08:48 +00:00
Stephen Chen
fbc7a00a5c Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev am: 194638ac78
am: d2f9de37c7

Change-Id: Id8725588b14f6a74efbdb2065864f2fce1561873
2017-09-08 19:04:48 +00:00
Maurice Lam
f2063cff30 Don't default to PIN on non FBE devices. DO NOT MERGE
So that EncryptionInterstitial is shown as part of the flow

Test: cd tests/robotests && mma
Bug: 65192141
Change-Id: I13e8b9059aae39cef2a8509f9f0eee1cd0808220
2017-09-08 18:58:27 +00:00
Stephen Chen
d2f9de37c7 Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev
am: 194638ac78

Change-Id: I6dc3ce13040a0b20b5197c5cfac6bc55b09ab679
2017-09-08 18:55:58 +00:00
TreeHugger Robot
194638ac78 Merge "Make auto Wi-Fi summary text consistent with feature availability." into oc-mr1-dev 2017-09-08 18:47:08 +00:00
jackqdyulei
1caec026da Add OWNERS for folder password
Bug: 65294119
Test: Build
Change-Id: Id1c2d9233643a18c1e104255a9e2b8b1aaefc44e
2017-09-08 11:17:43 -07:00
debesay guadad
2260e8ac26 Merge "Add ims registration status" into oc-mr1-dev-plus-aosp
am: 6f48d5e767  -s ours

Change-Id: I625d9a95d02865a6a97685421a00cee145b99de7
2017-09-08 17:44:36 +00:00
debesay guadad
0a59b9f651 Add ims registration status
am: 5b1651b3bb  -s ours

Change-Id: Ib49e236b3701eea3269565d515bb6c9e9c265e23
2017-09-08 17:24:22 +00:00
TreeHugger Robot
6f48d5e767 Merge "Add ims registration status" into oc-mr1-dev-plus-aosp 2017-09-08 17:14:18 +00:00
Brad Ebinger
8c321bc6da Merge "Add ims registration status" 2017-09-08 17:04:24 +00:00
Daniel Nishi
59c8d77c8c Re-add the block of text explaining the feature.
When the automatic storage manager  is off (or has never been run), we
display a block of text that explains what it does. In order to make
this testable, I've implemented the feature in a PreferenceController
and upgraded the existing AutomaticStorageManagerSettings class to be
closer to the newer Settings IA.

Change-Id: I3f7d20347a6d5a7bae8bffcd2014c3fdcd315b90
Fixes: 63082545
Test: Settings Robotest
2017-09-08 09:58:05 -07:00
Andrew Scull
2ca3017f8e Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.
If an admin has set the DISALLOW_FACTORY_RESET user restriction, OEM
unlock is also restricted. If this is the case, it should be explained
to the user that the admin is preventing the OEM unlock.

DISALLOW_OEM_UNLOCK is deprecated and now managed by OemLockManager.
This restriction is also one set by the carrier, not an admin.

Test: RunSettingsRoboTests
Test: CTS verifier test from the bug
Bug: 65124732
Change-Id: I8bde87a522742a7cbda006eee17c2a19797b1835
(cherry picked from commit 0aa45bed65)
2017-09-08 16:11:36 +00:00
Andrew Scull
f9ab23ef03 Merge "Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock." 2017-09-08 16:01:41 +00:00
Andrew Scull
0aa45bed65 Policy transparency when DISALLOW_FACTORY_RESET prevents OEM unlock.
If an admin has set the DISALLOW_FACTORY_RESET user restriction, OEM
unlock is also restricted. If this is the case, it should be explained
to the user that the admin is preventing the OEM unlock.

DISALLOW_OEM_UNLOCK is deprecated and now managed by OemLockManager.
This restriction is also one set by the carrier, not an admin.

Test: RunSettingsRoboTests
Test: CTS verifier test from the bug
Bug: 65124732
Change-Id: I8bde87a522742a7cbda006eee17c2a19797b1835
2017-09-08 12:40:25 +01:00
daqi
35cfba1fa0 Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508 am: 93860b298b am: 21e55623f2
am: b4204836cf

Change-Id: I7e9a1cb5c57fb58610cb20ba3d1469b752193e9d
2017-09-08 10:23:05 +00:00
daqi
b4204836cf Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508 am: 93860b298b
am: 21e55623f2

Change-Id: I38f6f53ffd70f8b1ac67ea3695d2b9d5d4b76509
2017-09-08 10:16:34 +00:00
daqi
21e55623f2 Merge "Fix TrustedCredentialsSettings NPE" am: c9e532f508
am: 93860b298b

Change-Id: Ic6fd44c164821fc7c5594b1b5082c2ee6e36aa0f
2017-09-08 10:10:16 +00:00