OSDN Git Service
jeffreyhuang [Wed, 22 Nov 2017 19:39:21 +0000 (11:39 -0800)]
Update AccountDetailDashboardFragmentTest
- Update test to work with sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I4c1c98330951f48f378330b51178fc188bba2571
TreeHugger Robot [Fri, 17 Nov 2017 22:20:05 +0000 (22:20 +0000)]
Merge "Update code to match FeatureFlagUtils interface change."
TreeHugger Robot [Fri, 17 Nov 2017 20:34:34 +0000 (20:34 +0000)]
Merge "Remove the private dns dialog in developer page"
Cody Northrop [Fri, 17 Nov 2017 20:33:24 +0000 (20:33 +0000)]
Merge "Rootless GPU Debug"
Fan Zhang [Fri, 17 Nov 2017 19:16:46 +0000 (11:16 -0800)]
Update code to match FeatureFlagUtils interface change.
Bug:
36222960
Test: rerun robotests
Change-Id: Iecaaf2dfa1ec0a7f6754e74b723d619e16ec93bf
jackqdyulei [Wed, 15 Nov 2017 21:33:55 +0000 (13:33 -0800)]
Remove the private dns dialog in developer page
This code is added in go/aog/524415. Since we added this dialog
in network page(ag/
3193880), we could delete it in developer
page safely.
Bug:
68030013
Test: Build
Change-Id: Id306160f4a87599ebbb68a86606c672ef800cd8a
Cody Northrop [Wed, 25 Oct 2017 20:07:48 +0000 (14:07 -0600)]
Rootless GPU Debug
This commit adds a new toggle to allow loading GPU debug
layers from the base directory of debuggable applications.
It corresponds to changes to GraphicsEnvironment to look for
matching application and layer list, which are then selectively
passed on the native components, like the Vulkan loader.
Bug:
63708377
Test: Manual, CTS tests to follow
Change-Id: Id6917a7b34df4a37905fafe08a4c1b6503abbb0c
TreeHugger Robot [Fri, 17 Nov 2017 18:01:53 +0000 (18:01 +0000)]
Merge "Code cleanup in Zen Mode Settings"
Beverly [Fri, 17 Nov 2017 15:00:20 +0000 (10:00 -0500)]
Code cleanup in Zen Mode Settings
Changes in response to code review from automerged commit ag/
3171711
Test: make -j40 RunSettingsRoboTests
Bug: n/a
Change-Id: I5df3db4e8ff421ca9911c84ae3f621a0e3d08092
TreeHugger Robot [Thu, 16 Nov 2017 23:21:51 +0000 (23:21 +0000)]
Merge "Add test and fix null keys in search providers."
Jeffrey Huang [Thu, 16 Nov 2017 21:55:29 +0000 (21:55 +0000)]
Merge "Dynamic advanced button for about phone v2"
Jeffrey Huang [Thu, 16 Nov 2017 21:09:27 +0000 (21:09 +0000)]
Merge "Copy controllers from about phone v1 to v2"
Jeffrey Huang [Thu, 16 Nov 2017 21:09:00 +0000 (21:09 +0000)]
Merge "Additional search terms for about phone v2"
Fan Zhang [Thu, 16 Nov 2017 17:56:03 +0000 (09:56 -0800)]
Add test and fix null keys in search providers.
- Add keys to some screens.
- Remove dynamic saved network/turst agent from search provider.
- Remove dynamic print services from printsettings.
Bug:
69384409
Test: atest
Change-Id: I62dce27d52585badb2a8953a05084e35dbae2f7d
Jie Cheng [Thu, 16 Nov 2017 20:32:00 +0000 (20:32 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly" am:
8d3d166823 am:
c6525f5e24
am:
74ffa3a130
Change-Id: If48f4ca4e945835a5006253e8f7eba44e4316e6e
Jie Cheng [Thu, 16 Nov 2017 20:20:45 +0000 (20:20 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly" am:
8d3d166823
am:
c6525f5e24
Change-Id: I2516b9132982104ef870d79a7c63c7d002f036de
Jie Cheng [Thu, 16 Nov 2017 20:18:44 +0000 (20:18 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly"
am:
8d3d166823
Change-Id: I67a977b974ddbf42b01647e4ca02d7d9dfe1b61d
Treehugger Robot [Thu, 16 Nov 2017 20:14:27 +0000 (20:14 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly"
TreeHugger Robot [Thu, 16 Nov 2017 19:44:25 +0000 (19:44 +0000)]
Merge "Add search to phone number preference"
jeffreyhuang [Wed, 15 Nov 2017 22:51:22 +0000 (14:51 -0800)]
Copy controllers from about phone v1 to v2
- Add feedback, device fcc, and manual controllers
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Id2aeaa3a18cc83360e252df32f19a69ecd12f59f
Jie Cheng [Mon, 25 Sep 2017 05:54:55 +0000 (13:54 +0800)]
Preference SimSettingsActivity not aligned correctly
The preference SimSettingsActivity in the screen "Network & Internet"
never uses a summary. However the text for this preference ("SIM cards")
is top aligned in order to make room for an extra line for the
non-existing summary.
Solved by setting the summary to @string/summary_empty for the
preference SimSettingsActivity. This will make the text in the
preference to align correctly and not leave extra room for a summary.
Test: manual - Checked that preference SimSettingsActivity is correctly
aligned in screen "Network & Internet".
Bug:
69405185
Change-Id: I1a1b3fa7253bbf2a5299f54cc8c4d3e857ca059c
Fan Zhang [Thu, 16 Nov 2017 01:38:12 +0000 (01:38 +0000)]
Merge "Catch exception when checking WifiDisplay availability" am:
7a08901d1b am:
6d5e7bf41f
am:
7d72837179
Change-Id: Icd680a4790dfbf694ae15f044ab6ffab02435727
Fan Zhang [Thu, 16 Nov 2017 01:36:10 +0000 (01:36 +0000)]
Merge "Catch exception when checking WifiDisplay availability" am:
7a08901d1b
am:
6d5e7bf41f
Change-Id: I8e1453bdd39ce220381a3368846bb137c4878dd4
Fan Zhang [Thu, 16 Nov 2017 01:33:31 +0000 (01:33 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
am:
7a08901d1b
Change-Id: I426208a605e3771238bd91c135e47faf1b559e58
Treehugger Robot [Thu, 16 Nov 2017 01:27:57 +0000 (01:27 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
jeffreyhuang [Wed, 15 Nov 2017 22:23:44 +0000 (14:23 -0800)]
Dynamic advanced button for about phone v2
- Set the number of tiles for the advanced button based on the device's
sim count
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I86a5e95476eb93a94607e8c379b132a80a5a1fc5
jeffreyhuang [Wed, 15 Nov 2017 23:35:53 +0000 (15:35 -0800)]
Add search to phone number preference
- implement preference controller mixin
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I907420e49c710427c4cd3ad6fccb2f58f99164ea
jeffreyhuang [Wed, 15 Nov 2017 23:28:23 +0000 (15:28 -0800)]
Additional search terms for about phone v2
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I07172133aa61a36c8c499237d4acaa6a2f392ba0
Fan Zhang [Thu, 19 Oct 2017 23:49:21 +0000 (16:49 -0700)]
Catch exception when checking WifiDisplay availability
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes:
68013053
Test: robotests
TreeHugger Robot [Wed, 15 Nov 2017 23:06:00 +0000 (23:06 +0000)]
Merge "Add control to save button."
Fan Zhang [Wed, 15 Nov 2017 22:40:31 +0000 (22:40 +0000)]
Merge "Misc fixes"
TreeHugger Robot [Wed, 15 Nov 2017 21:59:47 +0000 (21:59 +0000)]
Merge "Added zen settings messages and calls preferences."
Bruno Martins [Wed, 15 Nov 2017 21:59:25 +0000 (21:59 +0000)]
Merge "Settings: Add notification channel for SIM selection" am:
c543d5ba26 am:
7431ad3a80
am:
440373dbde
Change-Id: I605e13adb0e050ee73e646fa13c62f88271271b6
Bruno Martins [Wed, 15 Nov 2017 21:56:18 +0000 (21:56 +0000)]
Merge "Settings: Add notification channel for SIM selection" am:
c543d5ba26
am:
7431ad3a80
Change-Id: Ic3241dfe4bc53a1206fb92a1a5c8f0b91cedfca0
Bruno Martins [Wed, 15 Nov 2017 21:54:16 +0000 (21:54 +0000)]
Merge "Settings: Add notification channel for SIM selection"
am:
c543d5ba26
Change-Id: I72ac5944b8b4dc3eb2ad38c89ec8eb12f83b019d
Treehugger Robot [Wed, 15 Nov 2017 21:45:41 +0000 (21:45 +0000)]
Merge "Settings: Add notification channel for SIM selection"
jackqdyulei [Thu, 9 Nov 2017 18:37:46 +0000 (10:37 -0800)]
Add control to save button.
If the mode is PRIVATE_DNS_MODE_PROVIDER_HOSTNAME and hostname is
invalid, we should disable the save button. Otherwise enable the
save button.
Bug:
68030013
Test: RunSettingsRoboTests
Change-Id: If9149c119f1b396a7057590d515b62e7c19b9f99
Tony Mantler [Wed, 15 Nov 2017 19:19:40 +0000 (11:19 -0800)]
Copy proguard rules needed for Lifecycle support
Bug:
69350851
Test: Manual, sadly
Change-Id: Ice2b2697ec269e3ed0d3ca81940948189357cefb
Jeffrey Huang [Wed, 15 Nov 2017 18:01:07 +0000 (18:01 +0000)]
Merge "Speed up dev options"
Jeffrey Huang [Wed, 15 Nov 2017 18:00:39 +0000 (18:00 +0000)]
Merge changes Ibf5dc65b,I0cea3f76,I0dda78b4
* changes:
Phone number in about phone v2
Dynamic preferences for sim status
Dynamic preferences for IMEI
Bill Yi [Wed, 15 Nov 2017 03:46:04 +0000 (03:46 +0000)]
Import translations. DO NOT MERGE am:
fbdea47c44 -s ours am:
8b334cb99a -s ours
am:
ecb8315ba4 -s ours
Change-Id: Id12b28467cacd51ac8c899a32971881ca7c4e007
Bill Yi [Wed, 15 Nov 2017 03:45:30 +0000 (03:45 +0000)]
Import translations. DO NOT MERGE am:
cc5fd487eb -s ours
am:
105f962faa -s ours
Change-Id: I2e67faa4152814ad92f41c710ef80a51f429c52a
TreeHugger Robot [Wed, 15 Nov 2017 03:43:24 +0000 (03:43 +0000)]
Merge "Send context object to FeatureFlagUtils."
Bill Yi [Wed, 15 Nov 2017 03:40:05 +0000 (03:40 +0000)]
Import translations. DO NOT MERGE am:
fbdea47c44 -s ours
am:
8b334cb99a -s ours
Change-Id: I62efe62a723ec05fac73635f10b4c54bfaea7961
Bill Yi [Wed, 15 Nov 2017 03:39:22 +0000 (03:39 +0000)]
Import translations. DO NOT MERGE
am:
cc5fd487eb -s ours
Change-Id: I743524b8dce39e4245389fc6c933f0a9578aaac1
Bill Yi [Wed, 15 Nov 2017 03:37:20 +0000 (03:37 +0000)]
Import translations. DO NOT MERGE
am:
fbdea47c44 -s ours
Change-Id: I791dd2ed3d53ac4230748c61169677190e143919
Xin Li [Wed, 15 Nov 2017 01:27:15 +0000 (01:27 +0000)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am:
274f3b22b7
Change-Id: Ibd9ff23599478d4b4fe1af2744b3b6eeaa35d37c
TreeHugger Robot [Wed, 15 Nov 2017 01:08:54 +0000 (01:08 +0000)]
Merge "We need REQUEST_DELETE_PACKAGES to uninstall"
jeffreyhuang [Tue, 14 Nov 2017 23:09:12 +0000 (15:09 -0800)]
Speed up dev options
- Put memory updates on background thread
- Prevent update state from being called twice
Bug:
69000975
Test: Manual
Change-Id: I186bc25f6b74a5098b1737891efee3a6855dc996
Fan Zhang [Tue, 14 Nov 2017 18:22:26 +0000 (10:22 -0800)]
Misc fixes
- align wifi connection dialog edittext to viewStart
- Generate a random password when wifi tether password is null
Change-Id: Ia5ca6098c9ef4641cb4f8b4e2b126da061e62830
Fixes:
67749595
Fixes:
64967301
Test: robotests
Xin Li [Wed, 15 Nov 2017 00:38:23 +0000 (16:38 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Change-Id: I981fa64f2c744afc31502e29df041c091bf98545
Lei Yu [Tue, 14 Nov 2017 23:58:54 +0000 (23:58 +0000)]
Merge "Fix broken test in NetworkDashboardFragmengTest"
TreeHugger Robot [Tue, 14 Nov 2017 22:58:02 +0000 (22:58 +0000)]
Merge "Print icons are now vector graphics."
Bruno Martins [Fri, 10 Nov 2017 13:58:46 +0000 (13:58 +0000)]
Settings: Add notification channel for SIM selection
Change-Id: I9318311fd6378a82050bb1604c29f0af2501c8b7
Jeffrey Huang [Tue, 14 Nov 2017 21:37:24 +0000 (21:37 +0000)]
Merge "Rename dev options xml file"
TreeHugger Robot [Tue, 14 Nov 2017 21:21:42 +0000 (21:21 +0000)]
Merge "Convert SettingsLib Lifecycle to Flatfoot"
jackqdyulei [Tue, 14 Nov 2017 21:18:10 +0000 (13:18 -0800)]
Fix broken test in NetworkDashboardFragmengTest
Bug:
69314157
Test: RunSettingsRoboTests
Change-Id: I43dbb4c32dec8c17dbab3c7425b390a1bd5a3d8e
Bill Yi [Tue, 14 Nov 2017 20:42:27 +0000 (12:42 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I72e5c29e7cd17ed3ee1ae77677b74ca287baa241
Bill Yi [Tue, 14 Nov 2017 20:38:18 +0000 (12:38 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ic67e156508ed64a3ae1f26c095f72929f29e9b63
Philip P. Moltmann [Tue, 5 Sep 2017 19:42:04 +0000 (12:42 -0700)]
We need REQUEST_DELETE_PACKAGES to uninstall
Test: Uninstalled app from settings
Bug:
64576642
Change-Id: Idfb37548c466fb8d06c100f7ffd5e4390d0bde1c
Beverly [Fri, 27 Oct 2017 18:44:23 +0000 (14:44 -0400)]
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
Tony Mantler [Fri, 10 Nov 2017 21:14:50 +0000 (13:14 -0800)]
Convert SettingsLib Lifecycle to Flatfoot
Bug:
69257739
Test: m -j RunSettingsRoboTests
Change-Id: I27e7850c39afb9c09297007e8cc352f410665653
Jeffrey Huang [Tue, 14 Nov 2017 18:11:07 +0000 (18:11 +0000)]
Merge "Use uname instead of proc/version"
Fan Zhang [Tue, 14 Nov 2017 01:37:53 +0000 (17:37 -0800)]
Send context object to FeatureFlagUtils.
Bug:
36222960
Test: robotests
Change-Id: I9ca2d8c679474e545988f518eaf32acf459abd2c
Fan Zhang [Tue, 14 Nov 2017 17:16:41 +0000 (17:16 +0000)]
Merge "Remove the feature flag for using new title."
William Luh [Tue, 14 Nov 2017 16:59:45 +0000 (16:59 +0000)]
Merge "Change security status icons."
TreeHugger Robot [Tue, 14 Nov 2017 03:02:25 +0000 (03:02 +0000)]
Merge "Convert location settings to DashboardFragment."
TreeHugger Robot [Tue, 14 Nov 2017 02:01:37 +0000 (02:01 +0000)]
Merge "Allow SettingsIntelligence to access SearchResultTrampoline"
Doris Ling [Tue, 14 Nov 2017 01:58:13 +0000 (17:58 -0800)]
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
TreeHugger Robot [Tue, 14 Nov 2017 01:51:52 +0000 (01:51 +0000)]
Merge "Expand all preferences when launch from search."
TreeHugger Robot [Tue, 14 Nov 2017 01:12:58 +0000 (01:12 +0000)]
Merge "Add private dns dialog in wifi settings"
Doris Ling [Thu, 2 Nov 2017 23:42:45 +0000 (16:42 -0700)]
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
jeffreyhuang [Tue, 14 Nov 2017 00:58:55 +0000 (16:58 -0800)]
Rename dev options xml file
Bug:
34203528
Test: Builds and tests still pass
Change-Id: I7990555244c57f526b8609ae11154683aed889be
TreeHugger Robot [Tue, 14 Nov 2017 00:42:22 +0000 (00:42 +0000)]
Merge "Revert "Get rid of SearchIndexableResources entirely.""
Fan Zhang [Mon, 13 Nov 2017 21:22:42 +0000 (13:22 -0800)]
Allow SettingsIntelligence to access SearchResultTrampoline
Bug:
64938328
Test: robotests
Change-Id: I89b0b8adf1e034f0fc57a3991fb56452a7210219
Xin Li [Mon, 13 Nov 2017 23:18:37 +0000 (15:18 -0800)]
Merge commit '
937ede14d84c2093f831ff8adab96dca207ad742' from
oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master
Change-Id: I91ee596e3800726445cfff5dd784bae9dfdad3ee
Merged-In: I91c48c73287a271bd6c99e60e216dead22e68764
jackqdyulei [Wed, 8 Nov 2017 21:29:23 +0000 (13:29 -0800)]
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
William Luh [Mon, 13 Nov 2017 22:37:41 +0000 (14:37 -0800)]
Change security status icons.
Bug:
68209195
Test: make RunSettingsRoboTests
Change-Id: I97c604c09a01c43344adc44004682a1297f038ca
Fan Zhang [Mon, 13 Nov 2017 22:48:49 +0000 (22:48 +0000)]
Revert "Get rid of SearchIndexableResources entirely."
Fixes:
69266642
This reverts commit
ba0077977f1445b8f41e8632d54969be3fc0b0b0.
Change-Id: I9de6914f194a65ba627b2e5e805884f894fc044f
TreeHugger Robot [Mon, 13 Nov 2017 22:46:21 +0000 (22:46 +0000)]
Merge "Prevent monkey from opening dev options"
TreeHugger Robot [Mon, 13 Nov 2017 22:46:21 +0000 (22:46 +0000)]
Merge "Revert "Prevent monkey from changing usb settings""
Philip P. Moltmann [Mon, 13 Nov 2017 18:21:05 +0000 (10:21 -0800)]
Print icons are now vector graphics.
Test: Looked at screens in setting that show this icon
Bug:
69175097
Change-Id: I06c4d37c7c3e641e83fa81d59b651c581e94a9f1
TreeHugger Robot [Mon, 13 Nov 2017 21:55:23 +0000 (21:55 +0000)]
Merge "Adding a link to Setting activity for the Home app"
Doris Ling [Mon, 13 Nov 2017 21:43:17 +0000 (13:43 -0800)]
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
jeffreyhuang [Mon, 13 Nov 2017 19:31:40 +0000 (11:31 -0800)]
Prevent monkey from opening dev options
Change-Id: I155fc195a9f800ff099592244f13228646f586ac
Fixes:
68707778
Test: Manual with settings app
TreeHugger Robot [Mon, 13 Nov 2017 20:40:55 +0000 (20:40 +0000)]
Merge "Revert "Expand all preferences when launch from search.""
tiansiming [Mon, 13 Nov 2017 20:26:41 +0000 (20:26 +0000)]
Merge "Modify Comparator in ZonePicker" am:
3c03207f9f am:
cd2e1c1535
am:
78d7e2a096
Change-Id: I9dff60079bf81e6c4c70200e8869fc77321f6b0c
Sunny Goyal [Mon, 13 Nov 2017 18:09:09 +0000 (10:09 -0800)]
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
tiansiming [Mon, 13 Nov 2017 19:52:12 +0000 (19:52 +0000)]
Merge "Modify Comparator in ZonePicker" am:
3c03207f9f
am:
cd2e1c1535
Change-Id: I97ec8751980a29d953f1a49b36cc78b66461e3e7
tiansiming [Mon, 13 Nov 2017 19:50:06 +0000 (19:50 +0000)]
Merge "Modify Comparator in ZonePicker"
am:
3c03207f9f
Change-Id: I1c2ebde217a793091ff28f9b2b1850beeb494d52
Treehugger Robot [Mon, 13 Nov 2017 19:45:10 +0000 (19:45 +0000)]
Merge "Modify Comparator in ZonePicker"
Jeffrey Huang [Mon, 13 Nov 2017 19:34:00 +0000 (19:34 +0000)]
Revert "Prevent monkey from changing usb settings"
This reverts commit
7b17780134ad883b87fe4d586b072583b2e24441.
Change-Id: I5990c1ee09f387b03a8a0836776053484ece7569
Fan Zhang [Mon, 13 Nov 2017 18:30:11 +0000 (18:30 +0000)]
Revert "Expand all preferences when launch from search."
This reverts commit
6589a07d5915d8bcc911ddf36054549a7cc1a219.
Bug:
68988454
Fixes:
69242304
Change-Id: Iec29dbe302064a6209fbb0a8e7901c9a0f8744c0
TreeHugger Robot [Sat, 11 Nov 2017 08:28:20 +0000 (08:28 +0000)]
Merge "Fix a NPE when displaying device detail page."
Fan Zhang [Sat, 11 Nov 2017 01:02:38 +0000 (17:02 -0800)]
Fix a NPE when displaying device detail page.
Bug:
68956750
Test: robotests
Change-Id: I1eed4e07ad723ee787a333ae88cd2ced62b3d34f
TreeHugger Robot [Sat, 11 Nov 2017 00:58:33 +0000 (00:58 +0000)]
Merge "Settings: Remove HAL HDR+ option"
jeffreyhuang [Thu, 9 Nov 2017 20:15:05 +0000 (12:15 -0800)]
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
jeffreyhuang [Wed, 8 Nov 2017 23:53:43 +0000 (15:53 -0800)]
Dynamic preferences for sim status
- Support N-sim devices for sim status preference
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I0cea3f765f89c30a6595631ed501ab1c0010b736
jeffreyhuang [Wed, 8 Nov 2017 22:43:34 +0000 (14:43 -0800)]
Dynamic preferences for IMEI
- Support N-sim devices for imei preference
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I0dda78b44e0c64ddd69c9a30e90c49f03b2260f3
tiansiming [Mon, 30 Oct 2017 13:39:48 +0000 (21:39 +0800)]
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>