Commit Graph

41477 Commits

Author SHA1 Message Date
tiansiming
cd2e1c1535 Merge "Modify Comparator in ZonePicker"
am: 3c03207f9f

Change-Id: I1c2ebde217a793091ff28f9b2b1850beeb494d52
2017-11-13 19:50:06 +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
Yoshinori Hirano
136c6888ae Merge "Send broadcast when location mode is about to change DO NOT MERGE" am: 1c05be48ae -s ours am: 5c50b5362b
am: bfc6983947  -s ours

Change-Id: Ieb432ef40528554abbe69f709b83c4180dbc2e4f
2017-11-10 15:33:09 +00:00
Yoshinori Hirano
bfc6983947 Merge "Send broadcast when location mode is about to change DO NOT MERGE" am: 1c05be48ae -s ours
am: 5c50b5362b

Change-Id: Ibadd921cd884e0ebfc208d64a350a64545516f3a
2017-11-10 15:21:37 +00:00
Yoshinori Hirano
5c50b5362b Merge "Send broadcast when location mode is about to change DO NOT MERGE"
am: 1c05be48ae  -s ours

Change-Id: Ia443491992c0b28a15d93ca344e9b20c0a111548
2017-11-10 15:14:43 +00:00
Treehugger Robot
1c05be48ae Merge "Send broadcast when location mode is about to change DO NOT MERGE" 2017-11-10 15:07:04 +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
Yoshinori Hirano
d35311e993 Send broadcast when location mode is about to change DO NOT MERGE
Send "com.android.settings.location.MODE_CHANGING" broadcast intent
when the location mode is about to be changed on Settings app or
Quick Settings.

Fixes: 28057031
Test: manual - turn the location setting on

Change-Id: Icd1049259403999a30263cc866698795b44f9b2e
2017-11-10 10:45:34 +09: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
songkailun
538f78c839 Merge "remove unused code in PrivacySettings" am: abd78cc6b3 am: 0da27eb08c
am: de80f4ee5f

Change-Id: Iaff60e1fa06b9c73de21a5693383ea17b4a06e91
2017-11-09 22:50:47 +00:00
songkailun
df6026453e Merge "translate array in res/values-ar" am: 0df2c8fbb7 am: 834025ef19
am: 46644059a5

Change-Id: Ia58c633ffb25dd1805ceb19a47760e50e630066d
2017-11-09 22:49:56 +00: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
songkailun
de80f4ee5f Merge "remove unused code in PrivacySettings" am: abd78cc6b3
am: 0da27eb08c

Change-Id: I3e82479c29fe00c195b80e80497aaa2b402146cd
2017-11-09 21:21:37 +00:00
songkailun
0da27eb08c Merge "remove unused code in PrivacySettings"
am: abd78cc6b3

Change-Id: I8772066bf9bf759628f1937ca1949086a8ff8509
2017-11-09 21:19:30 +00:00
Treehugger Robot
abd78cc6b3 Merge "remove unused code in PrivacySettings" 2017-11-09 21:11:22 +00:00
songkailun
46644059a5 Merge "translate array in res/values-ar" am: 0df2c8fbb7
am: 834025ef19

Change-Id: Ib9c1c3c7ca24dee083e94c3cfdfd987132992937
2017-11-09 20:59:59 +00:00
songkailun
834025ef19 Merge "translate array in res/values-ar"
am: 0df2c8fbb7

Change-Id: Ic6175d77665dddd9ccaee29b94be3a11025f45c9
2017-11-09 20:53:10 +00:00
Fan Zhang
5c1e686d3f Merge "Update app icon for ManageDomainUrls setting" 2017-11-09 20:52:57 +00:00
Treehugger Robot
0df2c8fbb7 Merge "translate array in res/values-ar" 2017-11-09 20:40:18 +00:00
TreeHugger Robot
b84c1c5afa Merge "Prevent crash in Search from Stack overflow" 2017-11-09 20:18:58 +00:00
Fan Zhang
4e540db06d Update app icon for ManageDomainUrls setting
Change-Id: I6c26a055983ea72049d1633336d6da8736a78fa0
Fixes: 69057114
Test: robotests
2017-11-09 11:02:23 -08:00
jeffreyhuang
4cbeaf6729 Introduce BuildNumberDialogController
- Create a controller to display data and for the
  build number field in FirmwareVersionDialogFragment

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Ie283981d6e7ed519df1a77fd21158feb37f0efd8
2017-11-09 11:02:04 -08:00
jeffreyhuang
890d3c766c Introduce KernelVersionDialogController
- Create a controller to display data and for the
  kernel version field in FirmwareVersionDialogFragment

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Ie3f735e4559d8b01f67c65a1a46f1f1ad2dcdcd5
2017-11-09 11:02:04 -08:00
jeffreyhuang
633a67c821 Introduce BasebandVersionDialogController
- Create a controller to display data and for the
  baseband version field in FirmwareVersionDialogFragment

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I6818966f43549f41f20a488190e3116322858089
2017-11-09 11:02:04 -08:00
jeffreyhuang
bebb100e0a Introduce SecurityPatchLevelDialogController
- Create a controller to display data and handle user input for the
  security patch level field in FirmwareVersionDialogFragment

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I4ca93d9b0e74a5eaf5746704d46de42f5ae27224
2017-11-09 11:02:04 -08:00
jeffreyhuang
799c777f67 Introduce FirmwareVersionDialogController
- Create a controller to display data and handle user input for the
 Android Version field in FirmwareVersionDialogFragment

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Iabd46505103711451001a9374906188c707be548
2017-11-09 11:02:04 -08:00
Matthew Fritze
f6cf598d03 Prevent crash in Search from Stack overflow
NotificationSettingBase's getPreferenceController call
is recursive with no base case which crashes search.

Root cause here is that NotificationSettingsBase should
not be indexed for seacrh but was probably failing the
code inspection test. Added NotificationSettingsBase
child classes to grandfather list of classes that
should be ignored for search.

Change-Id: I04ed242db3a394b88e0d0ac420aaaff6f9301cb5
Fixes: 69096424
Test: robotests
2017-11-09 10:40:14 -08:00
Christine Franks
a760cc12ff Merge "NightDisplayController -> ColorDisplayController" 2017-11-09 17:50:06 +00:00
TreeHugger Robot
582182cfde Merge "Change the 'Internet' to 'internet'" 2017-11-09 01:05:02 +00:00
jackqdyulei
35be33a921 Change the 'Internet' to 'internet'
In Android P, we need to global change 'Internet' to 'internet'.
This cl updates all the strings.

What's more, for some strings, we change the whole sentences to make
them clearer:
1. wifi_cellular_data_fallback_summary
2. vpn_first_always_on_vpn_message

Bug: 68934232
Test: Manual
Change-Id: I6b6249e78df69d125a7ceec2b46f020c2892a105
2017-11-08 13:47:22 -08:00