Beverly
b7b74226c3
Added footers to zen mode settings
...
ZenModeSettings Footer displays when DND will end
ZenModeBehaviorSettings Footer describes why dnd behavior cannot be changed when
in alarms only or total silence mode
Test: make RunSettingsRoboTests -j40
Bug: 63077372
Change-Id: Iefbb3995da4af2b210c8e0c3c3a798d3c613e275
2017-12-05 14:35:31 -05:00
Fan Zhang
5f3716d1de
Catch a rare NPE due in SuggestionController
...
In monkey test, suggestion service can detach right before UI tries to query.
Change-Id: Ic2eeb81140f5b5d38688fbe92d20f68b9fa48c34
Fixes: 69979152
Test: monkey
2017-12-05 10:36:08 -08:00
Jeffrey Huang
cad68b3cfa
Merge "Display IMEI info when sim is removed"
2017-12-05 18:34:27 +00:00
Jeffrey Huang
d42f19e016
Merge "Default ICCID number to unavailable if no sim"
2017-12-05 18:34:05 +00:00
Fan Zhang
dff6dd687e
Move away from deprecated FakeFeatureFactory.setupForTest()
...
Test: rerun
Change-Id: I896ba414315ddb1664c0499264f4992f0554ef98
2017-12-05 10:12:10 -08:00
Fan Zhang
caf5358e40
Merge "Hack to wait for both suggestion/category to load"
2017-12-05 17:38:42 +00:00
Antony Sargent
26e5f828f7
Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3
am: eee62e1846
am: 9cf1fc73f1
am: 24f063a207
am: 3d7dbd6407
am: 9867a3ef85
am: acacd658f1
...
am: db6e747ab9
Change-Id: Ibf7cb8c3c7947dbc8cbf019ab32b872756ed7c63
2017-12-05 17:36:29 +00:00
Antony Sargent
db6e747ab9
Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3
am: eee62e1846
am: 9cf1fc73f1
am: 24f063a207
am: 3d7dbd6407
am: 9867a3ef85
...
am: acacd658f1
Change-Id: If9851b0b24c020d3a10b197fc15b6777bd88401c
2017-12-05 17:32:41 +00:00
Antony Sargent
acacd658f1
Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3
am: eee62e1846
am: 9cf1fc73f1
am: 24f063a207
am: 3d7dbd6407
...
am: 9867a3ef85
Change-Id: Ic9195106304da657092f113817ec7ad86618a2b1
2017-12-05 17:28:54 +00:00
Antony Sargent
9867a3ef85
Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3
am: eee62e1846
am: 9cf1fc73f1
am: 24f063a207
...
am: 3d7dbd6407
Change-Id: Ifa4509bbabbb346ce581f17d33e3f48fc7014971
2017-12-05 17:26:51 +00:00
Antony Sargent
3d7dbd6407
Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3
am: eee62e1846
am: 9cf1fc73f1
...
am: 24f063a207
Change-Id: I44b42f37a638cda455bbeb3ab4bab5c02fc9c7d9
2017-12-05 17:24:48 +00:00
Antony Sargent
24f063a207
Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3
am: eee62e1846
...
am: 9cf1fc73f1
Change-Id: I4906dc8f97cfcfeef7bfda0896b39c032ef26ec6
2017-12-05 17:21:14 +00:00
Antony Sargent
9cf1fc73f1
Reword bluetooth confirmation dialog am: e14d38a383
am: b2b401b5f3
...
am: eee62e1846
Change-Id: Ie6fff7cf9df6827a29c04473ed3a0f1332c08ff2
2017-12-05 17:19:12 +00:00
Antony Sargent
eee62e1846
Reword bluetooth confirmation dialog am: e14d38a383
...
am: b2b401b5f3
Change-Id: I21921d41d35a87a48ad627e9889e4d00219e912b
2017-12-05 17:17:08 +00:00
Antony Sargent
b2b401b5f3
Reword bluetooth confirmation dialog
...
am: e14d38a383
Change-Id: Ibb19504f6a74015a2a4d25d5c268db975da4ebb5
2017-12-05 17:13:36 +00:00
TreeHugger Robot
22c7164d56
Merge changes I9ef0979a,I241c5cea
...
* changes:
Move wifi test package to sdk 26
Create new ShadowBidiFormatter
2017-12-05 01:55:26 +00:00
Jordan Liu
493fbd8df1
Merge "Hide signal strength when told by carrier" am: 9afa720abe
am: ed9508f3a6
...
am: d2b04e92fe
Change-Id: Ie046e5290a3486f01f8cd41c61357b1dc7e418c0
2017-12-05 00:56:27 +00:00
Jordan Liu
d2b04e92fe
Merge "Hide signal strength when told by carrier" am: 9afa720abe
...
am: ed9508f3a6
Change-Id: I43c22e7f6950adcf27a5b600a194927cbd06fb9b
2017-12-05 00:27:13 +00:00
jeffreyhuang
71cf59e62f
Move wifi test package to sdk 26
...
Test: make RunSettingsRoboTests -j40
Change-Id: I9ef0979a7c6c3647cedd48a2c6ab855928c1b57e
2017-12-04 16:18:55 -08:00
jeffreyhuang
f140cc6505
Create new ShadowBidiFormatter
...
- Use the new shadow to work around comparing spannable strings
Test: make RunSettingsRoboTests -j40
Change-Id: I241c5ceab98da2e57f6812a637e677f66fc01a8f
2017-12-04 16:18:55 -08:00
Jordan Liu
ed9508f3a6
Merge "Hide signal strength when told by carrier"
...
am: 9afa720abe
Change-Id: I64b6eece29d475d8fdbaf8f6d1fb2c62701fd6e4
2017-12-04 23:45:57 +00:00
Lei Yu
983a68e789
Merge "Disable ConnectedDeviceConnectedActivity"
2017-12-04 23:45:32 +00:00
Jordan Liu
9afa720abe
Merge "Hide signal strength when told by carrier"
2017-12-04 23:20:31 +00:00
Fan Zhang
cbc97bc7dd
Hack to wait for both suggestion/category to load
...
- This is unfortunately necessary to avoid a jank when category
load completes before suggestion load, in which case user has to
manually scroll up to see the suggestions.
- We could technically just add scrollTo(0), but that causes the list
scroll on its own within 0.5 second of settings start, and that's bad.
Change-Id: I8dc869a69a5bf11bbf7644b281cc1778dd1a90e8
Fixes: 69068691
Test: visual
Test: robotests
2017-12-04 15:06:56 -08:00
jeffreyhuang
1012c60fd2
Default ICCID number to unavailable if no sim
...
Test: Manual
Change-Id: I22c69b5c40578a43f5edf01487e41b14e08ec35b
2017-12-04 14:42:09 -08:00
jeffreyhuang
c8badc7ceb
Display IMEI info when sim is removed
...
Change-Id: I9c6db4481e9b03c8984d350cd54722a3667b6c49
Fixes: 70165342
Test: make RunSettingsRoboTests -j40
2017-12-04 14:33:58 -08:00
Tony Mantler
65a015f67d
Merge "Remove proguard rules that are imported via aapt2"
2017-12-04 22:30:54 +00:00
TreeHugger Robot
40859ae5a3
Merge changes from topic "advanced_bt_page"
...
* changes:
Add preference Received files
Add(copy) AdvancedConnectedDeviceDashboardFragment
2017-12-04 22:11:00 +00:00
TreeHugger Robot
a793857b7e
Merge changes Ia73a89d1,I78ee508d,I4aa035a4,I926eaa5f,I9389254b, ...
...
* changes:
Update cachedStorageValueHelperTest to sdk 26
Move AutoStorageManagementSwitchPrefCtrl to sdk 26
Update SecondaryUserControllerTest to sdk 26
Update StorageItemPrefCtrlTest to sdk 26
Update StorageSummaryDonutPrefCtrl test to sdk 26
Update UserProfileControllerTest to sdk 26
2017-12-04 22:06:36 +00:00
jackqdyulei
4076bae930
Disable ConnectedDeviceConnectedActivity
...
Only one connected device activity could be enabled at one time. This
cl disbale the new version but keep old version enabled in
AndroidMainfest.xml.
In this case tile could find correct activity at any time.
Bug: 69810208
Test: Build
Change-Id: I0175b968cc26e38d0549fe2302b762fe0bc65c20
2017-12-04 13:35:12 -08:00
jackqdyulei
e978f8c5b4
Add preference Received files
...
Given that BluetoothFilesPreferenceController is already
exist, we could reuse this controller and only add
preference to xml.
Bug: 69333961
Test: Screenshot
Change-Id: I11285fd9a2b6c297dbf43a9a0b118c21780e6710
2017-12-04 12:56:20 -08:00
jackqdyulei
d3f314077b
Add(copy) AdvancedConnectedDeviceDashboardFragment
...
AdvancedConnectedDeviceDashboardFragment is the same as
ConnectedDeviceDashboardFagment except for:
1. Bt preference is not MasterSwitchPreference anymore.
2. New Bluetooth file preference.
This cl copies following files:
1. connected_devices_advanced(from *_old)
2. Advanced*Fragment(from *Old)
3. Advanced*Test(from old test)
Future cl will work on differences.
Bug: 69333961
Test: RunSettingsRoboTests
Change-Id: I4a7cb7225482fb8919af95bc5586e3bf0a80b1cb
2017-12-04 12:56:20 -08:00
jeffreyhuang
1e9f1b0e64
Update cachedStorageValueHelperTest to sdk 26
...
Test: make RunSettingsRoboTests -j40
Change-Id: Ia73a89d10727910545724f121ffc07ae306ec185
2017-12-04 12:33:26 -08:00
jeffreyhuang
406def2b38
Move AutoStorageManagementSwitchPrefCtrl to sdk 26
...
Test: make RunSettingsRoboTests -j40
Change-Id: I78ee508de3b76d19dc801950ee3513a115d0c22b
2017-12-04 12:33:26 -08:00
jeffreyhuang
5b43113287
Update SecondaryUserControllerTest to sdk 26
...
Test: make RunSettingsRoboTests -j40
Change-Id: I4aa035a46180ad791602200d066ffb8b06f25b93
2017-12-04 12:33:25 -08:00
jeffreyhuang
6ffe277c01
Update StorageItemPrefCtrlTest to sdk 26
...
Test: make RunSettingsRoboTests -j40
Change-Id: I926eaa5f5355d166d770813939f7bcc6256d196e
2017-12-04 12:33:25 -08:00
jeffreyhuang
b2597ee9d2
Update StorageSummaryDonutPrefCtrl test to sdk 26
...
Test: make RunSettingsRoboTests -j40
Change-Id: I9389254b94452e3f23b964225445435f2384901d
2017-12-04 11:55:06 -08:00
jeffreyhuang
dc12dc5660
Update UserProfileControllerTest to sdk 26
...
Test: make RunSettingsRoboTests -j40
Change-Id: Ia0f654fd54e43b0fdba3077f7df178faaa314b3d
2017-12-04 11:54:22 -08:00
TreeHugger Robot
d786fc5bdd
Merge "Delete deprecated controller"
2017-12-04 18:43:26 +00:00
TreeHugger Robot
312d6c4912
Merge "ZenPreferences observe zen changes from USER_ALL"
2017-12-03 16:24:46 +00:00
Chien-Yu Chen
f7540b42dc
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev am: fa3af7b0e7
...
am: 890c9a7ad3
-s ours
Change-Id: I61fcbf171ab4e6e9a251a1c312ccbfa0f9c9cc83
2017-12-03 03:44:11 +00:00
Chien-Yu Chen
5d3fcf1239
Revert "Revert "Settings: Enable HAL HDR+ by default"" am: 24721e7d96
...
am: c8d91c6066
-s ours
Change-Id: Id22341f5c7beb7112bf1fe378a4bd09ba47d3d81
2017-12-03 03:43:36 +00:00
Chien-Yu Chen
890c9a7ad3
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
...
am: fa3af7b0e7
Change-Id: I67347d636270ab4995dcb315c0adc0f67bf82795
2017-12-03 03:28:40 +00:00
Chien-Yu Chen
c8d91c6066
Revert "Revert "Settings: Enable HAL HDR+ by default""
...
am: 24721e7d96
Change-Id: Iec2832d2ae85edb92576af5688a067b88528fb1a
2017-12-03 03:28:03 +00:00
TreeHugger Robot
fa3af7b0e7
Merge changes from topic "easel-dev-to-oc-mr1-dev" into oc-mr1-dev
...
* changes:
Settings: Remove HAL HDR+ option
Revert "Revert "Settings: Enable HAL HDR+ by default""
2017-12-03 03:20:19 +00:00
TreeHugger Robot
2b7c0f2265
Merge "Add controllers for default app shortcut preferences."
2017-12-02 03:12:50 +00:00
TreeHugger Robot
1bd76a97d3
Merge "Move suggestions test package to sdk 26"
2017-12-02 02:37:20 +00:00
TreeHugger Robot
9a61e915b4
Merge "Update WebViewAppPickerTest to sdk 26"
2017-12-02 01:59:26 +00:00
TreeHugger Robot
eca562fabe
Merge "move tests to sdk 26"
2017-12-02 01:47:31 +00:00
TreeHugger Robot
61691b5a4f
Merge changes I8ce427ea,If33c3d3a,I579be569,I755c04da
...
* changes:
move search test package to sdk 26
Update accessibilityserviceresult test to sdk 26
Update IntentSearchViewHolderTest to sdk 26
fix DatabaseIndexingManagerTest hanging in tests
2017-12-02 01:32:49 +00:00