OSDN Git Service
TreeHugger Robot [Thu, 8 Feb 2018 19:46:26 +0000 (19:46 +0000)]
Merge "Add Toggle Controllers to XML"
Jan Nordqvist [Mon, 22 Jan 2018 22:43:43 +0000 (14:43 -0800)]
Update DataUsageSummary to include carrier provided information.
This CL augments the existing data usage display with carrier provided
information about data usage and plans when available from the new
frameworks API.
Test: manual
Test: make RunSettingsRoboTests
Bug:
70950124
Change-Id: Idde1ff786e8c5dbc04e58ffbcc0fd18789682699
TreeHugger Robot [Thu, 8 Feb 2018 17:00:59 +0000 (17:00 +0000)]
Merge "Apply checkbox enable state on viewholder bind"
Lei Yu [Thu, 8 Feb 2018 07:54:25 +0000 (07:54 +0000)]
Merge "Make ConnectedDevice page handles bt intent"
TreeHugger Robot [Thu, 8 Feb 2018 06:21:11 +0000 (06:21 +0000)]
Merge "Remove dead code for DataPlanUsageSummary"
TreeHugger Robot [Thu, 8 Feb 2018 06:13:36 +0000 (06:13 +0000)]
Merge "Remove some dead code from search"
TreeHugger Robot [Thu, 8 Feb 2018 04:55:56 +0000 (04:55 +0000)]
Merge "Add feature flag for new DataUsageSummary fragment."
TreeHugger Robot [Thu, 8 Feb 2018 04:48:22 +0000 (04:48 +0000)]
Merge "Move old battery settings page to dev options"
Fan Zhang [Wed, 7 Feb 2018 21:50:09 +0000 (13:50 -0800)]
Remove dead code for DataPlanUsageSummary
This is an unfinished feature, no longer needed.
Change-Id: I358dcc8865184117d49e35b3e8dfcd84403261d0
Fixes:
73073608
Test: rebuild
jackqdyulei [Thu, 8 Feb 2018 01:49:09 +0000 (17:49 -0800)]
Make ConnectedDevice page handles bt intent
Fixes:
73088883
Test: Manual - click the bt tile in quick settings
Change-Id: I147a9a83b37fff4a7573f792cd9172fef84110f2
Matthew Fritze [Fri, 26 Jan 2018 18:15:49 +0000 (10:15 -0800)]
Add Toggle Controllers to XML
Autobrightness preference controller was accidentally removed from
display_settings.xml. Given that no tests were broken and this would
be a disaster for phone buddy & inline actions, I have added another
test which keeps a list of valid controllers that should exist in xml.
When more inline controllers types are added, they will be included
in this test.
Fixes:
72564979
Test: robotests
Change-Id: I40fe18f9118af9cec1c201632742d2949ff64be5
Fan Zhang [Thu, 8 Feb 2018 00:56:28 +0000 (16:56 -0800)]
Remove some dead code from search
Test: rebuild
Change-Id: If736f58c546fa9eafc405525c11640ca2576d446
jackqdyulei [Mon, 5 Feb 2018 23:24:55 +0000 (15:24 -0800)]
Move old battery settings page to dev options
Also remove the click action and ripple in new battery settings page.
Bug:
72728884
Test: Screenshot
Change-Id: I3b6b4978a407f8d1bf799b6a880cd396c861456b
TreeHugger Robot [Thu, 8 Feb 2018 00:16:35 +0000 (00:16 +0000)]
Merge "Delete WPS settings."
Julia Reynolds [Tue, 6 Feb 2018 20:09:43 +0000 (15:09 -0500)]
Apply checkbox enable state on viewholder bind
Change-Id: I5b263f02fb6a1779fd567eade3776044fddb6b11
Fixes:
72809700
Test: SettingsRoboTests
TreeHugger Robot [Wed, 7 Feb 2018 23:04:44 +0000 (23:04 +0000)]
Merge "Update style switchbar layout"
TreeHugger Robot [Wed, 7 Feb 2018 22:38:32 +0000 (22:38 +0000)]
Merge "Notification lock screen setting updates"
Eric Schwarzenbach [Tue, 6 Feb 2018 23:57:01 +0000 (15:57 -0800)]
Add feature flag for new DataUsageSummary fragment.
Creates a new fragment DataUsageSummaryLegacy, which is used
instead of DataUsageSummary when the feature flag is off (default
behavior).
Copies the current DataUsageSummary.java, data_usage.xml, and
DataUsageSummaryActivity to create the legacy versions. This
change allows for uninterupted development of new features in the
DataUsageSummary fragment.
Test: manual
Test: make RunSettingsRoboTests
Bug:
70950124
Change-Id: I9d79e108bbfc1c8ec620f86c0183f4ed3f41c9d7
tiansiming [田思明] [Wed, 7 Feb 2018 22:19:31 +0000 (22:19 +0000)]
Merge "Fix NPE in AutoSyncWorkDataPreferenceController" am:
cdd628e6e4 am:
0bc6b461be
am:
eb0ebc6b98
Change-Id: I12a16dd3ef5cfcda92efd166d3f2fccdd20527d1
tiansiming [田思明] [Wed, 7 Feb 2018 22:16:46 +0000 (22:16 +0000)]
Merge "Fix NPE in AutoSyncWorkDataPreferenceController" am:
cdd628e6e4
am:
0bc6b461be
Change-Id: I78899aef7b43c067f7c4094d7de63b95c4ee3f11
TreeHugger Robot [Wed, 7 Feb 2018 22:15:29 +0000 (22:15 +0000)]
Merge "Update copy for battery estimate related features"
tiansiming [田思明] [Wed, 7 Feb 2018 22:13:14 +0000 (22:13 +0000)]
Merge "Fix NPE in AutoSyncWorkDataPreferenceController"
am:
cdd628e6e4
Change-Id: Ic10709693acbf3f04704ed76a7474291af509cf5
TreeHugger Robot [Wed, 7 Feb 2018 22:05:39 +0000 (22:05 +0000)]
Merge "Pre-fixup for nav up button"
Treehugger Robot [Wed, 7 Feb 2018 22:01:51 +0000 (22:01 +0000)]
Merge "Fix NPE in AutoSyncWorkDataPreferenceController"
Andrew Sapperstein [Wed, 7 Feb 2018 21:57:57 +0000 (13:57 -0800)]
Delete WPS settings.
Removes the WPS PIN and Push button settings, all of
the strings, and related code.
Change-Id: I1c7a35ffc8491c57e07accba9b1b5f5407b01831
Fixes:
72421239
Test: deletes code, robotests
Julia Reynolds [Wed, 7 Feb 2018 20:44:28 +0000 (15:44 -0500)]
Update style switchbar layout
Test: manual
Change-Id: If1aaffe0ea7790603291ba412500e47efa6b7b3e
Fixes:
72424821
Fixes:
72423465
TreeHugger Robot [Wed, 7 Feb 2018 20:24:38 +0000 (20:24 +0000)]
Merge "Modify logging in WifiSettings."
Salvador Martinez [Sat, 20 Jan 2018 00:33:35 +0000 (16:33 -0800)]
Update copy for battery estimate related features
Many features are using the enhanced estimates but the copy for them
has gotten out of sync. This CL moves shared strings between Settings
and SysUI to SettingsLib and also updates features that use the
strings to have consistent behavior/text.
Test: Robotests
Bug:
65656091
Bug:
66909350
Bug:
67469159
Change-Id: Ie5ef1ed65429ca9805cff374f1439e5d61eb6591
Fan Zhang [Tue, 6 Feb 2018 22:21:01 +0000 (14:21 -0800)]
Pre-fixup for nav up button
- Remove SettingsDrawerActivity.EXTRA_SHOW_MENU and force up nav button
to always show. The button doesn't do anything yet. It just finishes
current activity.
- Remove dead code about suggestions
Change-Id: I61fa9fefbaa9bced841a05969544b1c824c564ce
Bug:
72337421
Test: rebuild
TreeHugger Robot [Wed, 7 Feb 2018 17:58:43 +0000 (17:58 +0000)]
Merge "Call super.onDestroy in ResetNetworkConfirm fragment"
Julia Reynolds [Wed, 7 Feb 2018 15:42:00 +0000 (10:42 -0500)]
Notification lock screen setting updates
- String update
- Don't show 'hide notifications' option at app/channel level
if 'don't show' is selected globally
Test: SettingsRoboTests
Change-Id: I180b91019183865aa0f4f6adce917ebe7211dbb5
Fixes:
72833828
Fixes:
72651566
TreeHugger Robot [Wed, 7 Feb 2018 16:23:16 +0000 (16:23 +0000)]
Merge "Change character limit for condition_zen_title"
Beverly [Wed, 7 Feb 2018 14:23:54 +0000 (09:23 -0500)]
Change character limit for condition_zen_title
Change-Id: I187e859bd010a746acea8953be88687df8758a54
Fixes:
73018789
Test: n/a
TreeHugger Robot [Wed, 7 Feb 2018 05:06:23 +0000 (05:06 +0000)]
Merge "Remove the second target for ConnectedApPreference"
TreeHugger Robot [Wed, 7 Feb 2018 04:26:54 +0000 (04:26 +0000)]
Merge "Remove the click action for battery header"
jackqdyulei [Wed, 7 Feb 2018 02:13:40 +0000 (18:13 -0800)]
Remove the click action for battery header
Also remove the ripple effect
Change-Id: I28c3dc928816f07a18591c0777b5b2f275715ca2
Fixes:
73018312
Test: Build
Lei Yu [Wed, 7 Feb 2018 02:07:54 +0000 (02:07 +0000)]
Merge changes from topic "battery_saver_step_1"
* changes:
Add preference controller for battery seekbar
Revamp the battery saver page
TreeHugger Robot [Wed, 7 Feb 2018 01:44:24 +0000 (01:44 +0000)]
Merge "Fix trust agent summary not being updated."
tiansiming [田思明] [Sun, 4 Feb 2018 12:45:42 +0000 (20:45 +0800)]
Fix NPE in AutoSyncWorkDataPreferenceController
AutoSyncWorkDataPreferenceController gets mUserHandle from
Utils.getManagedProfileWithDisabled which may return null,
crash will happend when updateState called.
So a judgement here seems helpful to make the program more robust.
Bug: https://partnerissuetracker.corp.google.com/u/1/issues/
72908879
Test: make ROBOTEST_FILTER="(AutoSyncWorkDataPreferenceControllerTest)"
RunSettingsRoboTests
Change-Id: I53ca027a2f2dd79655cc2eee67db236cfa03f656
Signed-off-by: tiansiming [田思明] <tiansiming@xiaomi.com>
TreeHugger Robot [Tue, 6 Feb 2018 23:52:12 +0000 (23:52 +0000)]
Merge "Misc fixes on settings search"
Antony Sargent [Tue, 6 Feb 2018 23:49:12 +0000 (15:49 -0800)]
Call super.onDestroy in ResetNetworkConfirm fragment
Test: monkey tests
Change-Id: I0ca8d0296db20a48e318391ef111cada8109e13b
Fixes:
72999943
Ben Lin [Tue, 6 Feb 2018 22:32:18 +0000 (22:32 +0000)]
Merge "Update comment about robotests' dummy ColorDisplayController."
TreeHugger Robot [Tue, 6 Feb 2018 22:14:29 +0000 (22:14 +0000)]
Merge "Update suggestion card width."
Doris Ling [Tue, 6 Feb 2018 22:08:47 +0000 (14:08 -0800)]
Fix trust agent summary not being updated.
- move the handling for enabling the trust agent preference and its
summary from displayPreference() into updateState(), so that when user
navigates to change screen lock or update trust agent and returns to the
security settings page, the trust agent preference enabled state and
summary will be refreshed correctly.
Change-Id: I60bccfdff755a046a9f5453d39a7ac9d3ce0277c
Fixes:
72420147
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 6 Feb 2018 20:27:20 +0000 (20:27 +0000)]
Merge "Check device for config_enableWallpaperService before calling service."
Ben Lin [Tue, 6 Feb 2018 20:25:30 +0000 (12:25 -0800)]
Update comment about robotests' dummy ColorDisplayController.
Bug: None
Test: None
Change-Id: Iadc38a3430b9002ee106782eeced350921581a29
Fan Zhang [Tue, 6 Feb 2018 19:36:07 +0000 (11:36 -0800)]
Misc fixes on settings search
- Remove some unused resources
- Disable contentDescription on search icon in homepage
Change-Id: I214b2be3db4fe4c12932763acfb40b6272b43600
Fixes:
72958338
Test: talkback
Doris Ling [Tue, 6 Feb 2018 01:55:16 +0000 (17:55 -0800)]
Update suggestion card width.
- instead of using hard-coded width for 1 or 2 cards, they should take
up the whole screen width minus the defined padding, so that when the
device is in landscape mode, they look better.
Change-Id: Ic6485c858c7742a154a6d9b05fff180f161be323
Fixes:
72850225
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 6 Feb 2018 20:13:16 +0000 (20:13 +0000)]
Merge "Add new touch and notification vibration intensity settings."
Michael Wright [Wed, 24 Jan 2018 15:40:46 +0000 (15:40 +0000)]
Add new touch and notification vibration intensity settings.
Bug:
64185329
Test: ROBOTEST_FILTER=VibrationSettingsTest m -j RunSettingsRoboTests
Change-Id: I449c7e0041aabfe48935a57cde93e8af77dcd783
TreeHugger Robot [Tue, 6 Feb 2018 17:09:33 +0000 (17:09 +0000)]
Merge "DND ixD changes"
TreeHugger Robot [Tue, 6 Feb 2018 16:25:26 +0000 (16:25 +0000)]
Merge "Notification settings updates"
Beverly [Thu, 1 Feb 2018 23:14:33 +0000 (18:14 -0500)]
DND ixD changes
- Subtext in Settings > Sound updated
- new icons for automatic dnd rules
- no toast when toggling on/off dnd rules
- dnd dialog has a warning if dnd will cause user to miss next alarm
Test: make ROBOTEST_FILTER=ZenModePreferenceControllerTest RunSettingsRoboTests -j40
Fixes:
72494029
Fixes:
72655216
Fixes:
72655609
Change-Id: I9d86d82529079f35e362f93e10914f0a60229cd8
Julia Reynolds [Mon, 5 Feb 2018 17:49:44 +0000 (12:49 -0500)]
Notification settings updates
- Hide channels when a group is blocked
- Update importance strings
- Allow app blocking from 'recently seen'
Test: RoboSettingsTests
Fixes:
72879584
Fixes:
72882969
Fixes:
72831483
Change-Id: I99e001d3eb9eef52251cd50da191d33923335fcf
TreeHugger Robot [Tue, 6 Feb 2018 05:20:26 +0000 (05:20 +0000)]
Merge changes Ib0328f03,Ic10efc63
* changes:
Add restrict and unrestrict dialog
Add app restrict tip and detector
jackqdyulei [Fri, 26 Jan 2018 02:00:01 +0000 (18:00 -0800)]
Add restrict and unrestrict dialog
Add a fake unrestrict tip so we could reuse the BatteryTipDialogFragment
to build the unrestrict dialog.
After this cl, restrict dialog has two types:
1. dialog to only restrict one app
2. dialog to restrict more than one app
Will add dialog to restrict more than 5 apps when strings are finalized.
Bug:
72385333
Bug:
72227981
Test: RunSettingsRoboTests
Change-Id: Ib0328f0386efad525b331fd713dd15d060a1a649
jackqdyulei [Fri, 12 Jan 2018 21:52:20 +0000 (13:52 -0800)]
Add app restrict tip and detector
1. Add RestrictAppTip with two state(new and handled)
2. Add RestrictAppDetector, and future cl will hook up
it with anomaly database
3. Add related dialog in BatteryTipDialogFragment
Bug:
72385333
Test: RunSettingsRoboTests
Change-Id: Ic10efc6387150e62b6c6ad8d4c0d16ff75564fac
jackqdyulei [Thu, 25 Jan 2018 02:26:53 +0000 (18:26 -0800)]
Add preference controller for battery seekbar
Also update SeekBarPreference so we can set min for it.
Bug:
72228477
Test: RunSettingsRoboTests
Change-Id: I5ab1bfd78b0bd461551012c121c7e76764843a30
Maggie Wang [Tue, 6 Feb 2018 02:35:24 +0000 (02:35 +0000)]
Merge "Add a footer to Location Settings page"
TreeHugger Robot [Tue, 6 Feb 2018 02:08:27 +0000 (02:08 +0000)]
Merge "Set categories to the adapter if suggestion is not available."
Maggie [Tue, 30 Jan 2018 04:29:16 +0000 (20:29 -0800)]
Add a footer to Location Settings page
At the bottom of Settings -> Security & Location -> Location, inject
footers with text provided by system apps. GmsCore uses this footer to
present legal consent info for Google Location Services.
Bug:
70350519
Test: Robo
Test: Manual
Change-Id: I201afdb30baa7b81b591d161fce5be55569b6320
TreeHugger Robot [Tue, 6 Feb 2018 00:28:25 +0000 (00:28 +0000)]
Merge "Update string for wifi calling."
Ben Lin [Mon, 5 Feb 2018 23:58:58 +0000 (15:58 -0800)]
Set categories to the adapter if suggestion is not available.
If there's no suggestion, we should set the category to the adapter
before returning.
Bug: none
Test: robotests
Change-Id: I73bb248d17edb3c398a9fb0a8f3913e7233fcc0b
TreeHugger Robot [Tue, 6 Feb 2018 00:15:42 +0000 (00:15 +0000)]
Merge "Increase app icon size from 24dp to 32dp."
Lei Yu [Mon, 5 Feb 2018 23:31:42 +0000 (23:31 +0000)]
Merge "Clean up WifiTetherPreferenceController"
Ben Lin [Mon, 5 Feb 2018 23:17:16 +0000 (15:17 -0800)]
Check device for config_enableWallpaperService before calling service.
On some devices, it is possible that config_enableWallpaperService is
false, in which then there is no wallpaper service on device. Calling
WallpaperManager#getWallpaperId will then result in an NPE. We should
just do a check and return false.
Bug:
62387789
Test: RoboSettingsTest
Change-Id: I31db6845f06533d92140bf91d0f7fc7e7bedc5c5
Fan Zhang [Wed, 31 Jan 2018 02:10:38 +0000 (18:10 -0800)]
Increase app icon size from 24dp to 32dp.
The app icon size as 24dp is too small. We'd like to increase to 32dp
based on latest UX feedback and to match Material Spec v2 wrt app icon
sizes.
Test: make RunSettingsRoboTest -j40 ROBOTEST_FILTER=AppPreferenceTest
Test: visual (Launch settings -> App & notification -> verify app icon
size increased)
Fixes:
71767701
Change-Id: I474df72075602fc48d3123127b4f9bf350374506
jackqdyulei [Wed, 24 Jan 2018 00:51:02 +0000 (16:51 -0800)]
Revamp the battery saver page
1. Make BatterySaverSettings extend from DashboardFragment
2. Add new layout
3. Add battery saver controller
Future cl will add controllers for seekbar and button
Bug:
72228477
Test: RunSettingsRoboTests
Change-Id: I21fb62aef874c04eca2988271f2fd9d7aacb0c6c
TreeHugger Robot [Mon, 5 Feb 2018 21:30:43 +0000 (21:30 +0000)]
Merge "Change superclass to InstrumentedFragment."
Doris Ling [Mon, 5 Feb 2018 20:38:15 +0000 (12:38 -0800)]
Update string for wifi calling.
Bug:
72330968
Test: rebuild
Change-Id: Ie1e189c1339762d4763540e1e678357020602f35
TreeHugger Robot [Mon, 5 Feb 2018 09:55:29 +0000 (09:55 +0000)]
Merge "Autofill compat - Settings"
Svetoslav Ganov [Mon, 5 Feb 2018 05:22:00 +0000 (21:22 -0800)]
Autofill compat - Settings
Test: manully can change autofill serivces
Update settings due to API signature change.
Change-Id: Idaf00fdbe7cb07cb174f3bbd8edcfa95ac734764
TreeHugger Robot [Sun, 4 Feb 2018 04:29:03 +0000 (04:29 +0000)]
Merge "Import translations. DO NOT MERGE"
Jeff Sharkey [Sat, 3 Feb 2018 23:41:16 +0000 (23:41 +0000)]
Merge "Move bugreport storage enabling into OS."
Jeff Sharkey [Sat, 3 Feb 2018 20:27:03 +0000 (13:27 -0700)]
Move bugreport storage enabling into OS.
It's convoluted to enable/disable bugreport storage based on the
"power menu" shortcut, and it's frustrating for dogfooders to have
to manually cycle this setting once to enable the provider.
So move the enable/disable logic directly into the OS, toggle it
when the broader DEVELOPMENT_SETTINGS_ENABLED changes, and update
to match state at device boot.
Test: builds, boots
Bug:
32540478
Change-Id: I8721dfbfc1dc2e19adb9cb5588f6b35f2872da9d
Bill Yi [Sat, 3 Feb 2018 17:59:40 +0000 (09:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iedbb92ccb4d0cd12e8516708c8c486e11a2550d3
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 3 Feb 2018 02:34:26 +0000 (02:34 +0000)]
Merge "Unregister broadcast receiver from AppInfoDashboardFragment."
Sundeep Ghuman [Sat, 3 Feb 2018 00:46:32 +0000 (16:46 -0800)]
Modify logging in WifiSettings.
This now respects both the Log tag setting and the developer options
toggle.
Bug: NA
Test: NA
Change-Id: I444b00cb35a61d8779cc46c90b33e611d5b0ac06
Doris Ling [Sat, 3 Feb 2018 00:13:47 +0000 (16:13 -0800)]
Unregister broadcast receiver from AppInfoDashboardFragment.
- onDestroy() call is missing from the fragment. Added it to unregister
the receiver that listens to the package remover.
Change-Id: I27c67a19e11824116849b769f0a7951b80c40f84
Fixes:
72879457
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 2 Feb 2018 23:38:21 +0000 (23:38 +0000)]
Merge "Fix NPE when instantiating SettingsPreferenceFragment"
TreeHugger Robot [Fri, 2 Feb 2018 22:20:09 +0000 (22:20 +0000)]
Merge "Introduce boolean flags to show/hide battery/memory in App info."
Doris Ling [Thu, 16 Nov 2017 19:03:40 +0000 (11:03 -0800)]
Change superclass to InstrumentedFragment.
- for fragments that do not implement the preference screen, change them
to inherit from InstrumentedFragment instead.
Change-Id: I791c2634024bd2c248efea955be5c680180d735c
Fixes:
68277111
Test: make RunSettingsRoboTests
TreeHugger Robot [Fri, 2 Feb 2018 21:23:24 +0000 (21:23 +0000)]
Merge "Update suggestion UI"
TreeHugger Robot [Fri, 2 Feb 2018 20:51:32 +0000 (20:51 +0000)]
Merge "Fix VisibleForTesting annotation in AppStateAppOpsBridge"
Ben Lin [Fri, 19 Jan 2018 23:03:59 +0000 (15:03 -0800)]
Introduce boolean flags to show/hide battery/memory in App info.
This adds two flags:
config_show_app_info_settings_memory
config_show_app_info_settings_battery
Which when individually set to false, will hide them item from "App
info" which is accessed from clicking on an application in Apps &
notifications -> App info.
Bug:
62379413
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=com.android.settings.applications
Change-Id: Ifb3b644901728dc7ea04d13198abddaa7b230538
Fan Zhang [Fri, 2 Feb 2018 20:15:37 +0000 (12:15 -0800)]
Fix NPE when instantiating SettingsPreferenceFragment
Change-Id: I3997d6436f358b802dff9be307c36031f4351ab4
Fixes:
72868191
Test: robotests
TreeHugger Robot [Fri, 2 Feb 2018 20:12:43 +0000 (20:12 +0000)]
Merge "Support GLIF v3 for lock screen settings"
TreeHugger Robot [Fri, 2 Feb 2018 19:44:23 +0000 (19:44 +0000)]
Merge "Always show wifi wake setting."
Doris Ling [Wed, 31 Jan 2018 23:05:21 +0000 (15:05 -0800)]
Update suggestion UI
- reduce space above and below the suggestion header
- reduce space around the suggestion cardview
- set the font family for the suggestion header and title.
Change-Id: Ief6247005f1e69fe5025af60f3c9627d357d94a4
Fixes:
72710227
Test: visual
Tony Mantler [Fri, 2 Feb 2018 18:48:03 +0000 (10:48 -0800)]
Fix VisibleForTesting annotation in AppStateAppOpsBridge
Should be PRIVATE (the default) and not NONE since it's called from the
regular constructor for the object.
Bug: Clean-up
Test: Compiles
Change-Id: I9eb8881ed03dcddd1b478e313f5a314b338fccd7
TreeHugger Robot [Fri, 2 Feb 2018 18:41:39 +0000 (18:41 +0000)]
Merge "Add ability to show/hide different device information."
yuemingw [Thu, 1 Feb 2018 17:52:50 +0000 (17:52 +0000)]
Rename DISALLOW_CONFIG_LOCATION_MODE to DISALLOW_CONFIG_LOCATION.
Bug:
72732481
Test: CtsVerifier test already in
Change-Id: I12a0593eba270727808588efc4c42c4e066c9446
Beverly Tai [Fri, 2 Feb 2018 15:27:04 +0000 (15:27 +0000)]
Merge "Zen Condition text and primary click changes"
Jin Dong [Fri, 2 Feb 2018 14:52:58 +0000 (14:52 +0000)]
Merge "Fix memory leak of page "Languages & input"" am:
f94ff6ce6f am:
6d55e0633e
am:
dd91556778
Change-Id: I5fb3f956aab62b5500bfa5d753061980371b41b5
Jin Dong [Fri, 2 Feb 2018 07:09:00 +0000 (07:09 +0000)]
Merge "Fix memory leak of page "Languages & input"" am:
f94ff6ce6f
am:
6d55e0633e
Change-Id: I841c0d095c15849c409b1c1ebb9d47b79b438788
Jin Dong [Fri, 2 Feb 2018 03:55:08 +0000 (03:55 +0000)]
Merge "Fix memory leak of page "Languages & input""
am:
f94ff6ce6f
Change-Id: Ie22f77eff353807e5a24cb6a2317b688f9b70193
TreeHugger Robot [Fri, 2 Feb 2018 01:15:36 +0000 (01:15 +0000)]
Merge "Highlight row (instead of ripple) when come from search."
TreeHugger Robot [Fri, 2 Feb 2018 00:35:42 +0000 (00:35 +0000)]
Merge "Fixes crash from selecting uninstalled app info from recents."
Joe LaPenna [Thu, 25 Jan 2018 18:20:53 +0000 (10:20 -0800)]
Always show wifi wake setting.
Remove WIFI_WAKEUP_AVAILABLE config setting its available by default.
Remove check for NETWORK_RECOMMENDATIONS_ENABLED, the feature no longer
uses the recommender.
Test: make RunSettingsRoboTests RunSettingsLibRoboTests;
Test: atest SettingsBackupTest; manual/exploratory
Bug:
69624403
Bug:
67952636
Change-Id: Ia65f7f9349e77a13ad4af1dbd992b28a5cb16368
Treehugger Robot [Thu, 1 Feb 2018 23:41:43 +0000 (23:41 +0000)]
Merge "Fix memory leak of page "Languages & input""