Commit Graph

3977 Commits

Author SHA1 Message Date
TreeHugger Robot
caacd0068b Merge "Convert SettingsLib Lifecycle to Flatfoot" 2017-11-14 21:21:42 +00:00
jackqdyulei
815f99a84d Fix broken test in NetworkDashboardFragmengTest
Bug: 69314157
Test: RunSettingsRoboTests
Change-Id: I43dbb4c32dec8c17dbab3c7425b390a1bd5a3d8e
2017-11-14 13:18:10 -08:00
Beverly
a58e52a0be Added zen settings messages and calls preferences.
- Made ZenModeSettings and ZenModeBehaviorSettings a DashboardFragment
- Switches in ZenModeBehaviorSettings all have their own preference controllers
- Instead of a dropdown, messages & calls have their own pages & preference controllers
- Added basic turn on/off DND button in settings (dialog not yet implemented)

Bug: 63077372
Fixes: 69057767
Test: make -j40 RunSettingsRoboTests
Change-Id: I1c70f77053713f66f873ee578477f23cfd7985bb
2017-11-14 14:16:26 -05:00
Tony Mantler
94a7c7d21c Convert SettingsLib Lifecycle to Flatfoot
Bug: 69257739
Test: m -j RunSettingsRoboTests
Change-Id: I27e7850c39afb9c09297007e8cc352f410665653
2017-11-14 11:04:40 -08:00
Jeffrey Huang
e1ead4d3d0 Merge "Use uname instead of proc/version" 2017-11-14 18:11:07 +00:00
Fan Zhang
06b0d5b564 Send context object to FeatureFlagUtils.
Bug: 36222960
Test: robotests
Change-Id: I9ca2d8c679474e545988f518eaf32acf459abd2c
2017-11-14 09:24:31 -08:00
Fan Zhang
4f74ed2d07 Merge "Remove the feature flag for using new title." 2017-11-14 17:16:41 +00:00
TreeHugger Robot
a40f6a2a45 Merge "Convert location settings to DashboardFragment." 2017-11-14 03:02:25 +00:00
TreeHugger Robot
745e9c13b5 Merge "Allow SettingsIntelligence to access SearchResultTrampoline" 2017-11-14 02:01:37 +00:00
Doris Ling
4a01283309 Remove the feature flag for using new title.
- remove all code that check for the feature flag, and use the new logic
by default.

Change-Id: I7fbe60da84c1c0f35e7241402a71d2bc4cd300e6
Fixes: 64564191
Test: make RunSettingsRoboTests
2017-11-13 17:58:13 -08:00
TreeHugger Robot
6483cf1eba Merge "Expand all preferences when launch from search." 2017-11-14 01:51:52 +00:00
TreeHugger Robot
dfdc85c339 Merge "Add private dns dialog in wifi settings" 2017-11-14 01:12:58 +00:00
Doris Ling
9ed29a2e57 Convert location settings to DashboardFragment.
- change LocationMode, LocationSettings, and ScanningSettings to be
DashboardFragment.
- remove LocationSettingsBase and moved base logics into base
controller.
- add controllers for the preferences under the 3 location settings
pages.

Fixes: 68719207
Test: make RunSettingsRoboTests
Change-Id: Icedf691c2a9f7989faebee39ea9da672209b7957
2017-11-13 17:05:14 -08:00
jeffreyhuang
d5e2fd30a9 Rename dev options xml file
Bug: 34203528
Test: Builds and tests still pass
Change-Id: I7990555244c57f526b8609ae11154683aed889be
2017-11-13 16:58:55 -08:00
TreeHugger Robot
bbdc72c95a Merge "Revert "Get rid of SearchIndexableResources entirely."" 2017-11-14 00:42:22 +00:00
Fan Zhang
439921345a Allow SettingsIntelligence to access SearchResultTrampoline
Bug: 64938328
Test: robotests
Change-Id: I89b0b8adf1e034f0fc57a3991fb56452a7210219
2017-11-13 16:27:39 -08:00
Xin Li
0599c79cf7 Merge commit '937ede14d84c2093f831ff8adab96dca207ad742' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master

Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee
Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764
2017-11-13 15:18:37 -08:00
jackqdyulei
05cb931a31 Add private dns dialog in wifi settings
This option lives in menu. A dialog will show up once this menu
is clicked.

We reuse most of the logic in go/aog/524415 with the following
updates:
1. Use radioGroup instead of directly control radioButton
2. remove bunch of methods if they are only used once.

Following cl will:
1. Remove this feature in development page
2. Add the help link at the bottom of the dialog
3. Disable "Save" button when hostname is invalid.

Bug: 68030013
Test: add for later

Change-Id: I4c6d359dc9c55675858c20e47953ef677b31c3b5
2017-11-13 14:53:14 -08:00
Fan Zhang
6c0c789460 Revert "Get rid of SearchIndexableResources entirely."
Fixes: 69266642

This reverts commit ba0077977f.

Change-Id: I9de6914f194a65ba627b2e5e805884f894fc044f
2017-11-13 22:48:49 +00:00
TreeHugger Robot
50fb75863e Merge "Revert "Prevent monkey from changing usb settings"" 2017-11-13 22:46:21 +00:00
TreeHugger Robot
5fb9348960 Merge "Adding a link to Setting activity for the Home app" 2017-11-13 21:55:23 +00:00
Doris Ling
9ff1d79ef6 Expand all preferences when launch from search.
- when the fragment is created, checks the argument to see if the extra
fragment arg key is set. If so, do not hide the preferences in the
preference screen inside the advanced button.

Change-Id: I80fa20672024fe702ed2ddab448232bdc92ce05f
Fixes: 68988454
Test: make RunSettingsRoboTests
2017-11-13 13:43:17 -08:00
TreeHugger Robot
8ab5410801 Merge "Revert "Expand all preferences when launch from search."" 2017-11-13 20:40:55 +00:00
tiansiming
2ed7c17d41 Merge "Modify Comparator in ZonePicker" am: 3c03207f9f am: cd2e1c1535
am: 78d7e2a096

Change-Id: I9dff60079bf81e6c4c70200e8869fc77321f6b0c
2017-11-13 20:26:41 +00:00
Sunny Goyal
43fccf9842 Adding a link to Setting activity for the Home app
The link is only visible if there is a default home add and it
implements a settings activity

Test: make -j20 RunSettingsRoboTests
Change-Id: Iac5d0ebd561bed2e5b2f84236cdb728362ed8663
2017-11-13 12:17:19 -08:00
tiansiming
78d7e2a096 Merge "Modify Comparator in ZonePicker" am: 3c03207f9f
am: cd2e1c1535

Change-Id: I97ec8751980a29d953f1a49b36cc78b66461e3e7
2017-11-13 19:52:12 +00:00
Treehugger Robot
3c03207f9f Merge "Modify Comparator in ZonePicker" 2017-11-13 19:45:10 +00:00
Jeffrey Huang
da3f0d9e56 Revert "Prevent monkey from changing usb settings"
This reverts commit 7b17780134.

Change-Id: I5990c1ee09f387b03a8a0836776053484ece7569
2017-11-13 19:34:00 +00:00
Fan Zhang
9ce35ad023 Revert "Expand all preferences when launch from search."
This reverts commit 6589a07d59.
Bug: 68988454
Fixes: 69242304

Change-Id: Iec29dbe302064a6209fbb0a8e7901c9a0f8744c0
2017-11-13 18:57:46 +00:00
TreeHugger Robot
3eec2834e0 Merge "Fix a NPE when displaying device detail page." 2017-11-11 08:28:20 +00:00
Fan Zhang
7020d97545 Fix a NPE when displaying device detail page.
Bug: 68956750
Test: robotests
Change-Id: I1eed4e07ad723ee787a333ae88cd2ced62b3d34f
2017-11-10 17:12:50 -08:00
TreeHugger Robot
684e8b89bb Merge "Settings: Remove HAL HDR+ option" 2017-11-11 00:58:33 +00:00
jeffreyhuang
ba76fbeb3b Phone number in about phone v2
- Introduce preference controller to manage phone number
 - Add new strings for multi sim devices

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Ibf5dc65ba67969b6eeb095b8d202ef8a5faf16ca
2017-11-10 15:40:22 -08:00
jeffreyhuang
34c2387faa Dynamic preferences for sim status
- Support N-sim devices for sim status preference

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I0cea3f765f89c30a6595631ed501ab1c0010b736
2017-11-10 15:40:22 -08:00
jeffreyhuang
3adafdcc83 Dynamic preferences for IMEI
- Support N-sim devices for imei preference

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I0dda78b44e0c64ddd69c9a30e90c49f03b2260f3
2017-11-10 15:40:22 -08:00
tiansiming
3b8c4cd52e Modify Comparator in ZonePicker
The previous method "compareTo" isn't locale-sensitive, it cannot
sort the String in some other languages. So Collator is recommended
to be applyed here.

Bug: Sort doesn't work in some languages.
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=ZonePickerComparatorTest

Change-Id: Id107ab938cceefc77f9fb6918a0445fc92a0fcb7
Signed-off-by: tiansiming <tiansiming@xiaomi.com>
2017-11-10 23:12:38 +00:00
Fan Zhang
ba0077977f Get rid of SearchIndexableResources entirely.
Bug: 37741509
Test: robotests
Change-Id: I7e6dba5e13378beae632c838b7dd13acfdc50b10
2017-11-10 15:10:55 -08:00
Chien-Yu Chen
5d242df477 Settings: Remove HAL HDR+ option
Test: RunSettingsRoboTests
Bug: 68223991
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b
2017-11-10 14:32:25 -08:00
jeffreyhuang
0cdd620e62 Use uname instead of proc/version
- Update the displayed kernel version to use uname instead

Change-Id: Iced2540f775c03c273521c8965c2f331267982b2
Fixes: 67006899
Test: Manual with settings app
2017-11-10 14:24:02 -08:00
Fan Zhang
b21112bd3d Add instrumentation test for SearchResultTrampoline intent.
Forgot to add this when creating intent-filter

Bug: 64938328
Test: atest
Change-Id: I8cfc26c2c589b2ae1942d365ed7dbca0da90d580
2017-11-10 12:25:47 -08:00
Jeffrey Huang
49dac3d4ac Merge changes Ie283981d,Ie3f735e4,I6818966f,I4ca93d9b,Iabd46505
* changes:
  Introduce BuildNumberDialogController
  Introduce KernelVersionDialogController
  Introduce BasebandVersionDialogController
  Introduce SecurityPatchLevelDialogController
  Introduce FirmwareVersionDialogController
2017-11-10 18:47:25 +00:00
TreeHugger Robot
29b14a70d5 Merge changes I3ac6506a,I3fc80505
* changes:
  Add intent-filter to SearchResultTrampoline
  Create a feature flag for Search v2.
2017-11-10 02:31:35 +00:00
Christine Franks
e8338dc33d Merge "Support DISALLOW_CONFIG_LOCALE user restriction" 2017-11-10 01:36:05 +00:00
TreeHugger Robot
7d9637440a Merge "Expand all preferences when launch from search." 2017-11-10 01:17:28 +00:00
Fan Zhang
8068fda059 Add intent-filter to SearchResultTrampoline
Bug: 64938328
Test: atest
Change-Id: I3ac6506a6af3af9ff2bd60354ba23617b700ace8
2017-11-09 16:37:01 -08:00
TreeHugger Robot
bb09fd8425 Merge "Use setVisible instead of removePreference everywhere." 2017-11-10 00:02:58 +00:00
Christine Franks
91dad044cb Support DISALLOW_CONFIG_LOCALE user restriction
Bug: 67586452
Test: make ROBOTEST_FILTER="(LocaleListEditorTest)" RunSettingsRoboTests\
&& make cts && cts-tradefed run cts-dev -m DevicePolicyManager \
-t com.android.cts.devicepolicy.UserRestrictionsTest

Change-Id: I2260b106a111078a62ae7628d6f60e976b70069c
2017-11-09 23:57:03 +00:00
Doris Ling
6589a07d59 Expand all preferences when launch from search.
- when the fragment is created, checks the argument to see if the extra
fragment arg key is set. If so, do not hide the preferences in the
advanced button.

Change-Id: Id662ae1cec77edad7fcd5d6daa71929a8cb1402c
Fixes: 68988454
Test: make RunSettingsRoboTests
2017-11-09 15:18:09 -08:00
Fan Zhang
ff4da23a65 Create a feature flag for Search v2.
Also moved all other flags in a common file so we can track them more
easily.

Bug: 68825426
Bug: 64938328
Test: rerun robotests
Change-Id: I3fc805054cb960bedd965b1b907be759df50b95d
2017-11-09 14:57:08 -08:00
Fan Zhang
a72620b67b Use setVisible instead of removePreference everywhere.
Change-Id: I2e8084b23d3cb2c0a31a38c01716fc76236734ea
Fixes: 68956750
Test: robotests
2017-11-09 13:22:36 -08:00