Android Build Merger (Role)
b7773add7d
Merge "Merge "Add ims registration status" into stage-aosp-master am: af845720f6 am: 99768cc46c -s ours" into oc-mr1-dev-plus-aosp
2017-09-11 20:10:25 +00:00
Maurice Lam
4f61cfb967
Merge "Fix sizing of pattern view" into oc-mr1-dev
...
am: adef5b23e0
2017-09-11 20:09:55 +00:00
debesay guadad
d3c72406b6
Merge "Add ims registration status"
...
am: 9b7479f8a9
2017-09-11 20:09:47 +00:00
Antony Sargent
707552888d
Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev
...
am: b8ff97fbd5
2017-09-11 20:09:25 +00:00
Maurice Lam
adef5b23e0
Merge "Fix sizing of pattern view" into oc-mr1-dev
2017-09-11 20:07:48 +00:00
Maurice Lam
7efcc35d85
Fix sizing of pattern view
...
Align the size of pattern view in ChooseLockPattern,
ConfirmLockPattern, and keyguard as much as possible.
In rare cases they may still be inconsistent because
the screens have different content outside of the
pattern view (e.g. header text, navigation buttons etc)
Test: Manual
Bug: 64339681
Change-Id: Ie07ae211340967a3cdf9c6c28f9818f207dbd2c9
2017-09-11 20:07:17 +00:00
Brad Ebinger
e4589c3dfb
Merge "Add ims registration status" into stage-aosp-master am: af845720f6
...
am: 99768cc46c
2017-09-11 20:06:21 +00:00
jackqdyulei
a50a5e529b
Add OWNERS for folder fuelgauge
...
Bug: 65294119
Test: Manual
Change-Id: Ia1eb8155f2d4359d56b0babd474083295ba38a0b
2017-09-11 12:54:31 -07:00
Brad Ebinger
99768cc46c
Merge "Add ims registration status" into stage-aosp-master
...
am: af845720f6
2017-09-11 19:54:02 +00:00
TreeHugger Robot
b8ff97fbd5
Merge "Fix focus behavior of ValidatedEditTextPreference" into oc-mr1-dev
2017-09-11 19:52:47 +00:00
TreeHugger Robot
c939be6551
Merge "Fork a new developer options page."
2017-09-11 19:47:26 +00:00
Treehugger Robot
9b7479f8a9
Merge "Add ims registration status"
2017-09-11 19:44:31 +00:00
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
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
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
2017-09-11 18:01:35 +00:00
jackqdyulei
52a2d32a37
Merge "Make system item has a consistent name." into oc-mr1-dev
...
am: 9a3cb9b835
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
