OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoRevert "Expand all preferences when launch from search."
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
(cherry picked from commit 9ce35ad0231d27292e6df5ebbd078947626dd3df)

6 years agoSnap for 4447680 from 3eec2834e0ad9e338a2e321427eed1d4b7eee78b to pi-release
android-build-team Robot [Sun, 12 Nov 2017 08:32:24 +0000 (08:32 +0000)]
Snap for 4447680 from 3eec2834e0ad9e338a2e321427eed1d4b7eee78b to pi-release

Change-Id: I45fcfeefb29a2fd8014e729b3b7994cb46e1c44a

6 years agoMerge "Fix a NPE when displaying device detail page."
TreeHugger Robot [Sat, 11 Nov 2017 08:28:20 +0000 (08:28 +0000)]
Merge "Fix a NPE when displaying device detail page."

6 years agoFix 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

6 years agoMerge "Settings: Remove HAL HDR+ option"
TreeHugger Robot [Sat, 11 Nov 2017 00:58:33 +0000 (00:58 +0000)]
Merge "Settings: Remove HAL HDR+ option"

6 years agoGet rid of SearchIndexableResources entirely.
Fan Zhang [Fri, 10 Nov 2017 20:04:57 +0000 (12:04 -0800)]
Get rid of SearchIndexableResources entirely.

Bug: 37741509
Test: robotests
Change-Id: I7e6dba5e13378beae632c838b7dd13acfdc50b10

6 years agoSettings: Remove HAL HDR+ option
Chien-Yu Chen [Fri, 10 Nov 2017 21:51:24 +0000 (13:51 -0800)]
Settings: Remove HAL HDR+ option

Test: RunSettingsRoboTests
Bug: 68223991
Change-Id: I9eb27c7e205ac005c6a71726e125ed1e512da33b

6 years agoAdd instrumentation test for SearchResultTrampoline intent.
Fan Zhang [Fri, 10 Nov 2017 19:58:49 +0000 (11:58 -0800)]
Add instrumentation test for SearchResultTrampoline intent.

Forgot to add this when creating intent-filter

Bug: 64938328
Test: atest
Change-Id: I8cfc26c2c589b2ae1942d365ed7dbca0da90d580

6 years agoMerge changes Ie283981d,Ie3f735e4,I6818966f,I4ca93d9b,Iabd46505
Jeffrey Huang [Fri, 10 Nov 2017 18:47:25 +0000 (18:47 +0000)]
Merge changes Ie283981d,Ie3f735e4,I6818966f,I4ca93d9b,Iabd46505

* changes:
  Introduce BuildNumberDialogController
  Introduce KernelVersionDialogController
  Introduce BasebandVersionDialogController
  Introduce SecurityPatchLevelDialogController
  Introduce FirmwareVersionDialogController

6 years agoMerge "Send broadcast when location mode is about to change DO NOT MERGE" am: 1c05be4...
Yoshinori Hirano [Fri, 10 Nov 2017 15:33:09 +0000 (15:33 +0000)]
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

6 years agoMerge "Send broadcast when location mode is about to change DO NOT MERGE" am: 1c05be4...
Yoshinori Hirano [Fri, 10 Nov 2017 15:21:37 +0000 (15:21 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE" am: 1c05be48ae  -s ours
am: 5c50b5362b

Change-Id: Ibadd921cd884e0ebfc208d64a350a64545516f3a

6 years agoMerge "Send broadcast when location mode is about to change DO NOT MERGE"
Yoshinori Hirano [Fri, 10 Nov 2017 15:14:43 +0000 (15:14 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"
am: 1c05be48ae  -s ours

Change-Id: Ia443491992c0b28a15d93ca344e9b20c0a111548

6 years agoMerge "Send broadcast when location mode is about to change DO NOT MERGE"
Treehugger Robot [Fri, 10 Nov 2017 15:07:04 +0000 (15:07 +0000)]
Merge "Send broadcast when location mode is about to change DO NOT MERGE"

6 years agoMerge changes I3ac6506a,I3fc80505
TreeHugger Robot [Fri, 10 Nov 2017 02:31:35 +0000 (02:31 +0000)]
Merge changes I3ac6506a,I3fc80505

* changes:
  Add intent-filter to SearchResultTrampoline
  Create a feature flag for Search v2.

6 years agoSend broadcast when location mode is about to change DO NOT MERGE
Yoshinori Hirano [Tue, 24 Oct 2017 08:52:23 +0000 (17:52 +0900)]
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

6 years agoMerge "Support DISALLOW_CONFIG_LOCALE user restriction"
Christine Franks [Fri, 10 Nov 2017 01:36:05 +0000 (01:36 +0000)]
Merge "Support DISALLOW_CONFIG_LOCALE user restriction"

6 years agoMerge "Expand all preferences when launch from search."
TreeHugger Robot [Fri, 10 Nov 2017 01:17:28 +0000 (01:17 +0000)]
Merge "Expand all preferences when launch from search."

6 years agoAdd intent-filter to SearchResultTrampoline
Fan Zhang [Fri, 10 Nov 2017 00:37:01 +0000 (16:37 -0800)]
Add intent-filter to SearchResultTrampoline

Bug: 64938328
Test: atest
Change-Id: I3ac6506a6af3af9ff2bd60354ba23617b700ace8

6 years agoMerge "Use setVisible instead of removePreference everywhere."
TreeHugger Robot [Fri, 10 Nov 2017 00:02:58 +0000 (00:02 +0000)]
Merge "Use setVisible instead of removePreference everywhere."

6 years agoSupport DISALLOW_CONFIG_LOCALE user restriction
Christine Franks [Tue, 10 Oct 2017 22:37:04 +0000 (15:37 -0700)]
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

6 years agoExpand all preferences when launch from search.
Doris Ling [Thu, 9 Nov 2017 22:36:51 +0000 (14:36 -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
advanced button.

Change-Id: Id662ae1cec77edad7fcd5d6daa71929a8cb1402c
Fixes: 68988454
Test: make RunSettingsRoboTests

6 years agoCreate a feature flag for Search v2.
Fan Zhang [Thu, 9 Nov 2017 22:07:23 +0000 (14:07 -0800)]
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

6 years agoMerge "remove unused code in PrivacySettings" am: abd78cc6b3 am: 0da27eb08c
songkailun [Thu, 9 Nov 2017 22:50:47 +0000 (22:50 +0000)]
Merge "remove unused code in PrivacySettings" am: abd78cc6b3 am: 0da27eb08c
am: de80f4ee5f

Change-Id: Iaff60e1fa06b9c73de21a5693383ea17b4a06e91

6 years agoMerge "translate array in res/values-ar" am: 0df2c8fbb7 am: 834025ef19
songkailun [Thu, 9 Nov 2017 22:49:56 +0000 (22:49 +0000)]
Merge "translate array in res/values-ar" am: 0df2c8fbb7 am: 834025ef19
am: 46644059a5

Change-Id: Ia58c633ffb25dd1805ceb19a47760e50e630066d

6 years agoUse setVisible instead of removePreference everywhere.
Fan Zhang [Tue, 7 Nov 2017 23:00:53 +0000 (15:00 -0800)]
Use setVisible instead of removePreference everywhere.

Change-Id: I2e8084b23d3cb2c0a31a38c01716fc76236734ea
Fixes: 68956750
Test: robotests

6 years agoMerge "remove unused code in PrivacySettings" am: abd78cc6b3
songkailun [Thu, 9 Nov 2017 21:21:37 +0000 (21:21 +0000)]
Merge "remove unused code in PrivacySettings" am: abd78cc6b3
am: 0da27eb08c

Change-Id: I3e82479c29fe00c195b80e80497aaa2b402146cd

6 years agoMerge "remove unused code in PrivacySettings"
songkailun [Thu, 9 Nov 2017 21:19:30 +0000 (21:19 +0000)]
Merge "remove unused code in PrivacySettings"
am: abd78cc6b3

Change-Id: I8772066bf9bf759628f1937ca1949086a8ff8509

6 years agoMerge "remove unused code in PrivacySettings"
Treehugger Robot [Thu, 9 Nov 2017 21:11:22 +0000 (21:11 +0000)]
Merge "remove unused code in PrivacySettings"

6 years agoMerge "translate array in res/values-ar" am: 0df2c8fbb7
songkailun [Thu, 9 Nov 2017 20:59:59 +0000 (20:59 +0000)]
Merge "translate array in res/values-ar" am: 0df2c8fbb7
am: 834025ef19

Change-Id: Ib9c1c3c7ca24dee083e94c3cfdfd987132992937

6 years agoMerge "translate array in res/values-ar"
songkailun [Thu, 9 Nov 2017 20:53:10 +0000 (20:53 +0000)]
Merge "translate array in res/values-ar"
am: 0df2c8fbb7

Change-Id: Ic6175d77665dddd9ccaee29b94be3a11025f45c9

6 years agoMerge "Update app icon for ManageDomainUrls setting"
Fan Zhang [Thu, 9 Nov 2017 20:52:57 +0000 (20:52 +0000)]
Merge "Update app icon for ManageDomainUrls setting"

6 years agoMerge "translate array in res/values-ar"
Treehugger Robot [Thu, 9 Nov 2017 20:40:18 +0000 (20:40 +0000)]
Merge "translate array in res/values-ar"

6 years agoMerge cherrypicks of [3199697, 3199805, 3200163, 3199590] into pi-release
android-build-team Robot [Thu, 9 Nov 2017 20:38:16 +0000 (20:38 +0000)]
Merge cherrypicks of [3199697319980532001633199590] into pi-release

Change-Id: I8452f6b10a55c3dde6b50101cf4edb08ec1b088b

6 years agoPrevent crash in Search from Stack overflow
Matthew Fritze [Thu, 9 Nov 2017 17:40:09 +0000 (09:40 -0800)]
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
(cherry picked from commit f6cf598d0325c3c96927285b22c84f042e95b6fb)

6 years agoMerge "Prevent crash in Search from Stack overflow"
TreeHugger Robot [Thu, 9 Nov 2017 20:18:58 +0000 (20:18 +0000)]
Merge "Prevent crash in Search from Stack overflow"

6 years agoUpdate app icon for ManageDomainUrls setting
Fan Zhang [Wed, 8 Nov 2017 21:06:38 +0000 (13:06 -0800)]
Update app icon for ManageDomainUrls setting

Change-Id: I6c26a055983ea72049d1633336d6da8736a78fa0
Fixes: 69057114
Test: robotests

6 years agoIntroduce BuildNumberDialogController
jeffreyhuang [Fri, 3 Nov 2017 21:36:48 +0000 (14:36 -0700)]
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

6 years agoIntroduce KernelVersionDialogController
jeffreyhuang [Fri, 3 Nov 2017 21:08:48 +0000 (14:08 -0700)]
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

6 years agoIntroduce BasebandVersionDialogController
jeffreyhuang [Fri, 3 Nov 2017 20:52:04 +0000 (13:52 -0700)]
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

6 years agoIntroduce SecurityPatchLevelDialogController
jeffreyhuang [Fri, 3 Nov 2017 19:11:19 +0000 (12:11 -0700)]
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

6 years agoIntroduce FirmwareVersionDialogController
jeffreyhuang [Thu, 2 Nov 2017 22:46:43 +0000 (15:46 -0700)]
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

6 years agoPrevent crash in Search from Stack overflow
Matthew Fritze [Thu, 9 Nov 2017 17:40:09 +0000 (09:40 -0800)]
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

6 years agoMerge "NightDisplayController -> ColorDisplayController"
Christine Franks [Thu, 9 Nov 2017 17:50:06 +0000 (17:50 +0000)]
Merge "NightDisplayController -> ColorDisplayController"

6 years agoSnap for 4442369 from 582182cfde65eaa18ebd3ce9814dc7aff813e38c to pi-release
android-build-team Robot [Thu, 9 Nov 2017 08:35:15 +0000 (08:35 +0000)]
Snap for 4442369 from 582182cfde65eaa18ebd3ce9814dc7aff813e38c to pi-release

Change-Id: Iab2d77cb881eceee2e61e686dea25d537d556144

6 years agoMerge "Change the 'Internet' to 'internet'"
TreeHugger Robot [Thu, 9 Nov 2017 01:05:02 +0000 (01:05 +0000)]
Merge "Change the 'Internet' to 'internet'"

6 years agoChange the 'Internet' to 'internet'
jackqdyulei [Wed, 8 Nov 2017 21:40:20 +0000 (13:40 -0800)]
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

6 years agoEnforce null check for mAccessPoint am: 6c12f06bf8
Ningyuan Wang [Wed, 8 Nov 2017 21:41:15 +0000 (21:41 +0000)]
Enforce null check for mAccessPoint am: 6c12f06bf8
am: 1df7ba1cb6

Change-Id: I6b05dd3ee39ae242de89f2fbad1e271958219817

6 years agoEnforce null check for mAccessPoint
Ningyuan Wang [Wed, 8 Nov 2017 21:37:34 +0000 (21:37 +0000)]
Enforce null check for mAccessPoint
am: 6c12f06bf8

Change-Id: I0fbf4a19a6e28bc66bc6f320dae90bbe438c3341

6 years agoMerge "Forward wallpaper activity results to the caller."
TreeHugger Robot [Wed, 8 Nov 2017 21:18:57 +0000 (21:18 +0000)]
Merge "Forward wallpaper activity results to the caller."

6 years agoMerge "Change network detail page title."
TreeHugger Robot [Wed, 8 Nov 2017 20:27:30 +0000 (20:27 +0000)]
Merge "Change network detail page title."

6 years agoForward wallpaper activity results to the caller.
Ajay Nadathur [Tue, 7 Nov 2017 21:38:50 +0000 (13:38 -0800)]
Forward wallpaper activity results to the caller.

- Added Activity.FLAG_ACTIVITY_FORWARD_RESULT to the intent that
launches the wallpaper activities.
- WallpaperSuggestionActivity also finishes itself after launching
intent.

Bug: 65691577
Test: Added robolectric test. Also verified manually that result code is
being forwarded
Change-Id: I2f8b0fac7a35c38e14c4a733b7552fd2e58dd0db

6 years agoEnforce null check for mAccessPoint
Ningyuan Wang [Fri, 3 Nov 2017 18:16:56 +0000 (11:16 -0700)]
Enforce null check for mAccessPoint

mAccessPoint == null implies this is a new network.
In this case, we don't need to check if it's a carrier AP.

Bug: 68846574
Test: compile, manually test that crash does not happen again.
Test: make RunSettingsRoboTests -j40 aROBOTEST_FILTER=WifiConfigControllerTest

Change-Id: I03b1da5e8f0b8e4270c0c52c67bbc90c999be078
(cherry picked from commit 0117b995f44758a64b7af6d2d11e17d10ef125ce)

6 years agoMerge "PreferenceControllers are the way of the future."
Julia Reynolds [Wed, 8 Nov 2017 13:33:40 +0000 (13:33 +0000)]
Merge "PreferenceControllers are the way of the future."

6 years agoSnap for 4439972 from d85cd117c8387cee47f5b457e7121d81f4442174 to pi-release
android-build-team Robot [Wed, 8 Nov 2017 08:21:41 +0000 (08:21 +0000)]
Snap for 4439972 from d85cd117c8387cee47f5b457e7121d81f4442174 to pi-release

Change-Id: I58beef033cd71aa04a4d7f558db1aaeb581714a4

6 years agoMerge "Remove DynamicAvailabilityPreferenceController."
TreeHugger Robot [Wed, 8 Nov 2017 02:26:16 +0000 (02:26 +0000)]
Merge "Remove DynamicAvailabilityPreferenceController."

6 years agoMerge "Add ConnectedAccessPointPreference"
TreeHugger Robot [Tue, 7 Nov 2017 22:48:52 +0000 (22:48 +0000)]
Merge "Add ConnectedAccessPointPreference"

6 years agoMerge "Update hardware info dialog styles to support rtl"
Jeffrey Huang [Tue, 7 Nov 2017 21:07:54 +0000 (21:07 +0000)]
Merge "Update hardware info dialog styles to support rtl"

6 years agoRemove DynamicAvailabilityPreferenceController.
Fan Zhang [Tue, 7 Nov 2017 18:57:47 +0000 (10:57 -0800)]
Remove DynamicAvailabilityPreferenceController.

- This class is over complex to use, and get in the way of show/hide
  pref when availability change.
- The function from DynamicAvailabilityPreferenceController can be done
  with PreferenceCategoryController.

Bug: 68956750
Bug: 32953042
Test: robotests
Change-Id: Ia7b7e214c072b8c77f5de3d959fdb1dc79217f76

6 years agoMerge "Move Index provider conversion into Settings provider"
TreeHugger Robot [Tue, 7 Nov 2017 20:52:51 +0000 (20:52 +0000)]
Merge "Move Index provider conversion into Settings provider"

6 years agoMerge "Remove a second unwanted search result"
TreeHugger Robot [Tue, 7 Nov 2017 20:43:52 +0000 (20:43 +0000)]
Merge "Remove a second unwanted search result"

6 years agoMerge "Prevent monkey from changing usb settings"
TreeHugger Robot [Tue, 7 Nov 2017 19:37:03 +0000 (19:37 +0000)]
Merge "Prevent monkey from changing usb settings"

6 years agoMerge "Abort long-running benchmarks, report progress."
Jeff Sharkey [Tue, 7 Nov 2017 19:23:21 +0000 (19:23 +0000)]
Merge "Abort long-running benchmarks, report progress."

6 years agoMove Index provider conversion into Settings provider
Matthew Fritze [Fri, 3 Nov 2017 19:03:59 +0000 (12:03 -0700)]
Move Index provider conversion into Settings provider

Pre-patch, settings search provider would push all of its
fragments into to search via SearchIndexableResources with
an implicit contract of if the resource's xml == 0, then
it was a settings fragment with an Index provider.

One, implicit contract is bad. Two, it was messy at indexing time.

So this patch moves htat conversion into the search index provider.
Such that all of the indexables are either real Resources or Raw.

Change-Id: I39f4351c03d123bb9b45edb4df7f924cfaff2b38
Fixes: 65376542
Fixes: 37741509
Test: robotests

6 years agoRemove a second unwanted search result
jeffreyhuang [Tue, 7 Nov 2017 18:52:44 +0000 (10:52 -0800)]
Remove a second unwanted search result

 - Remove Security and location from the search query for lock screen message

Change-Id: Ifa8985c78b403867377cca351e11b3f58d5c60f2
Fixes: 65492727
Test: Manual using settings app

6 years agoUpdate hardware info dialog styles to support rtl
jeffreyhuang [Tue, 7 Nov 2017 18:59:32 +0000 (10:59 -0800)]
Update hardware info dialog styles to support rtl

Bug: 36458278
Test: Manual using settings app
Change-Id: I60f4fdfc3b8f3282e14591a5842e8a9e95070fa5

6 years agoPrevent monkey from changing usb settings
jeffreyhuang [Tue, 7 Nov 2017 00:51:27 +0000 (16:51 -0800)]
Prevent monkey from changing usb settings

 - Prevent monkey from revoking usb debugging authorizations
 - Prevent monkey from changing usb configurations

Bug: 68707778
Test: make RunSettingsRoboTests -j40
Change-Id: Idce99d60f0fbce5a9d93aceb0c2a07d27482de10

6 years agoMerge "Move iccid number to sim status dialog"
Jeffrey Huang [Tue, 7 Nov 2017 17:58:01 +0000 (17:58 +0000)]
Merge "Move iccid number to sim status dialog"

6 years agoAbort long-running benchmarks, report progress.
Jeff Sharkey [Mon, 6 Nov 2017 20:54:18 +0000 (13:54 -0700)]
Abort long-running benchmarks, report progress.

A typical storage device finishes the benchmark in under 10 seconds,
but some extremely slow devices can take minutes, resulting in a
confusing UX that looks like we've frozen.  Even worse, we keep
churning through all that I/O even though we know the device will
blow past our user-warning threshold.

So periodically check if we've timed out, and also use that to report
progress up into the Settings UI.

Test: manual
Bug: 622012096563976467055204
Exempt-From-Owner-Approval: I wrote the original code.
Change-Id: Idd9d8c181651202d1434af879cff9355478a25c1

6 years agoremove unused code in PrivacySettings
songkailun [Tue, 7 Nov 2017 11:28:55 +0000 (19:28 +0800)]
remove unused code in PrivacySettings

factory_reset is already removed from privacy_settings.xml,
so it need to be removed from PrivacySettings.java too

Change-Id: I0d295b90173102efb962dde496cf7a8b15d1e0a9
Signed-off-by: songkailun <songkailun@xiaomi.com>
6 years agotranslate array in res/values-ar
songkailun [Tue, 7 Nov 2017 11:49:09 +0000 (19:49 +0800)]
translate array in res/values-ar

"None" should be translated

Change-Id: I9cd1b21947834a070ba66a7ee7641d0b6617de52
Signed-off-by: songkailun <songkailun@xiaomi.com>
6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 7b75c5a338 -s ours
Bill Yi [Tue, 7 Nov 2017 09:50:32 +0000 (09:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 7b75c5a338  -s ours
am: c8de736ea2  -s ours

Change-Id: I07ed77f89000af9d409cb74b5183c4c564b464ae

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Tue, 7 Nov 2017 09:48:01 +0000 (09:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 7b75c5a338  -s ours

Change-Id: I129fdafc703d9cb714a49c00c9367b520fc86519

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Tue, 7 Nov 2017 09:41:30 +0000 (09:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE am: 73120a4cdb -s ours am: f74efef4fb -s ours
Bill Yi [Tue, 7 Nov 2017 09:37:58 +0000 (09:37 +0000)]
Import translations. DO NOT MERGE am: 73120a4cdb  -s ours am: f74efef4fb  -s ours
am: f2b1de1435  -s ours

Change-Id: I98bb3bafb87997c2dc334e912991aabbc6bf178c

6 years agoImport translations. DO NOT MERGE am: 73120a4cdb -s ours
Bill Yi [Tue, 7 Nov 2017 09:35:56 +0000 (09:35 +0000)]
Import translations. DO NOT MERGE am: 73120a4cdb  -s ours
am: f74efef4fb  -s ours

Change-Id: I1841bd7c3fe428749e74e3bda23f3765effb6735

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Nov 2017 09:33:26 +0000 (09:33 +0000)]
Import translations. DO NOT MERGE
am: 73120a4cdb  -s ours

Change-Id: Ida543e80dd13e3b5653c8676fe3032d5693a224d

6 years agoSnap for 4437123 from b573ea7a05cdd3efc438026ab6423089631f50d2 to pi-release
android-build-team Robot [Tue, 7 Nov 2017 08:24:41 +0000 (08:24 +0000)]
Snap for 4437123 from b573ea7a05cdd3efc438026ab6423089631f50d2 to pi-release

Change-Id: I5ada55818e5084aa4402f9dcb3a8b3ed61c0d73b

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Nov 2017 07:21:01 +0000 (23:21 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I16dfb5a1bbcd9d062c9f24914c0715c5f0cfe95e

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 7 Nov 2017 07:20:38 +0000 (23:20 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: I5e47736d365f0c8e75ec8e9ac0c84d599fbf7180

6 years agoMerge "Replace dns_tls with private_dns_mode setting" am: ca92fb5e2b am: 768f467089
Erik Kline [Tue, 7 Nov 2017 06:18:39 +0000 (06:18 +0000)]
Merge "Replace dns_tls with private_dns_mode setting" am: ca92fb5e2b am: 768f467089
am: 3194e6cbb8

Change-Id: Iee5ceb25248a7611b84fc06f93f52e287062cecd

6 years agoMerge "Replace dns_tls with private_dns_mode setting" am: ca92fb5e2b
Erik Kline [Tue, 7 Nov 2017 06:08:59 +0000 (06:08 +0000)]
Merge "Replace dns_tls with private_dns_mode setting" am: ca92fb5e2b
am: 768f467089

Change-Id: I70b86f3e2ebf823fea8a1516031f9137b2813bb3

6 years agoMerge "Replace dns_tls with private_dns_mode setting"
Erik Kline [Tue, 7 Nov 2017 06:00:15 +0000 (06:00 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"
am: ca92fb5e2b

Change-Id: I58c44a04ef75d025f63e9470ed9624a437a7956c

6 years agoMerge "Replace dns_tls with private_dns_mode setting"
Treehugger Robot [Tue, 7 Nov 2017 05:54:28 +0000 (05:54 +0000)]
Merge "Replace dns_tls with private_dns_mode setting"

6 years agoReplace dns_tls with private_dns_mode setting
Erik Kline [Mon, 30 Oct 2017 06:30:18 +0000 (15:30 +0900)]
Replace dns_tls with private_dns_mode setting

Also includes:
    - new layout fragment for private DNS configuration
    - PrivateDnsModeDialogPreference handler class

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
    - manual interaction with private dns developer option works
Bug: 34953048
Bug: 6413396
Change-Id: I3a5490c21f7f3b3e523a247c287f213d19b75a8b

6 years agoMerge "Fix robolectric test failure"
TreeHugger Robot [Tue, 7 Nov 2017 02:40:18 +0000 (02:40 +0000)]
Merge "Fix robolectric test failure"

6 years agoMerge "Convert SecuritySubSetting into DashboardFragment"
Fan Zhang [Tue, 7 Nov 2017 01:58:42 +0000 (01:58 +0000)]
Merge "Convert SecuritySubSetting into DashboardFragment"

6 years agoConvert SecuritySubSetting into DashboardFragment
Fan Zhang [Fri, 3 Nov 2017 22:43:53 +0000 (15:43 -0700)]
Convert SecuritySubSetting into DashboardFragment

Bug: 32953042
Test: robotests
Change-Id: Iecdb0a42695644ff8aa095bcd49b5ccb16aa46d4

6 years agoMerge "Update Wi-Fi Calling "Emergency address" text"
TreeHugger Robot [Tue, 7 Nov 2017 00:38:44 +0000 (00:38 +0000)]
Merge "Update Wi-Fi Calling "Emergency address" text"

6 years agoFix robolectric test failure
Fan Zhang [Mon, 6 Nov 2017 23:12:14 +0000 (15:12 -0800)]
Fix robolectric test failure

Bug: 36971201
Test: robotests
Change-Id: I5adc98b8bc42b98b39d38bf08e2ac1bfa5139819

6 years agoMerge "Revert the change that remove the video layout listener."
TreeHugger Robot [Mon, 6 Nov 2017 22:57:12 +0000 (22:57 +0000)]
Merge "Revert the change that remove the video layout listener."

6 years agoMerge "Add connectivity controllers to about phone v2"
Jeffrey Huang [Mon, 6 Nov 2017 22:32:46 +0000 (22:32 +0000)]
Merge "Add connectivity controllers to about phone v2"

6 years agoMerge "Fix crash in settings robo test."
Lei Yu [Mon, 6 Nov 2017 21:16:37 +0000 (21:16 +0000)]
Merge "Fix crash in settings robo test."

6 years agoMove iccid number to sim status dialog
jeffreyhuang [Mon, 6 Nov 2017 20:38:45 +0000 (12:38 -0800)]
Move iccid number to sim status dialog

 - Remove iccid number logic from imei dialog
 - Add iccid number log to sim status dialog

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I087688645169b387b9d65264e2c8b70ca565a44e

6 years agoMerge "Guard against a NPE when disconnecting suggestion service."
TreeHugger Robot [Mon, 6 Nov 2017 20:29:56 +0000 (20:29 +0000)]
Merge "Guard against a NPE when disconnecting suggestion service."

6 years agoAdd ConnectedAccessPointPreference
jackqdyulei [Thu, 2 Nov 2017 18:24:35 +0000 (11:24 -0700)]
Add ConnectedAccessPointPreference

This preference contains:
1. All the logic from AccessPointPreference
2. Gear icon on the right

Bug: 68807544
Test: RunSettingsRoboTests & Screenshot
Change-Id: I128401d81b075c4e9c5ca711562de26e73147745

6 years agoAdd connectivity controllers to about phone v2
jeffreyhuang [Mon, 6 Nov 2017 19:46:17 +0000 (11:46 -0800)]
Add connectivity controllers to about phone v2

 - Add IpAddressPreferenceController
 - Add WifiMacAddressPreferenceController
 - Add BluetoothAddressPreferenceController

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Idf55784721d28ac27b1b8186e26268e21c40688e

6 years agoFix crash in settings robo test.
jackqdyulei [Mon, 6 Nov 2017 18:59:21 +0000 (10:59 -0800)]
Fix crash in settings robo test.

This is a regression from ag/3120176. In AnomalyDialogFragment when
creating the real dialog, it creates the RuntimePermissionPresenter
which causes the stub error.

In this cl we shadow the RuntimePermissionPresenter since in this
test we only focus on that created dialog has the correct message
(dialog title, dialog message)

Bug: 68941201
Test: RunSettingsRoboTests
Change-Id: I9c09922453f7797f375d0f61b9d8eba660bfbfef

6 years agoPreferenceControllers are the way of the future.
Julia Reynolds [Fri, 13 Oct 2017 19:12:07 +0000 (15:12 -0400)]
PreferenceControllers are the way of the future.

Migrates Notification settings (app level, group level, and channel
level) into PreferenceControllers (and most importantly:
PreferenceControllerTest)

Note: this removes the 'Advanced' preference group, but does
not yet use the standard system 'Advanced' grouping as it does
not currently support our use case (where we don't know how many
fields to show outside of 'Advanced' until onResume() and also
where we need fields to show below the 'Advanced' group).

Test: make RunSettingsRoboTests
Change-Id: Iddd1b4771922db322e5f73562e9d63ed077c5396

6 years agoGuard against a NPE when disconnecting suggestion service.
Fan Zhang [Mon, 6 Nov 2017 18:30:05 +0000 (10:30 -0800)]
Guard against a NPE when disconnecting suggestion service.

Change-Id: Ib10502b9467365f6e348737655806ef2369a747b
Fixes: 68885411
Test: robotests

6 years agoMerge "Rtl layout support for about phone v2"
Jeffrey Huang [Mon, 6 Nov 2017 17:54:24 +0000 (17:54 +0000)]
Merge "Rtl layout support for about phone v2"