OSDN Git Service
android-build-team Robot [Wed, 14 Feb 2018 08:26:12 +0000 (08:26 +0000)]
Snap for
4603395 from
03017fc928da91667778dbe0051a0216f0cd5a99 to pi-release
Change-Id: I6562c798623571aba6cbed432b07d9fc37677513
TreeHugger Robot [Wed, 14 Feb 2018 02:35:10 +0000 (02:35 +0000)]
Merge "Don't set USB mode if user is a monkey"
Jerry Zhang [Tue, 13 Feb 2018 23:58:14 +0000 (15:58 -0800)]
Don't set USB mode if user is a monkey
Test: tests pass
Fixes:
73246183
Change-Id: I9570c8bd8b11edd6eb0944a4aa766c22b4cc3619
TreeHugger Robot [Wed, 14 Feb 2018 00:33:59 +0000 (00:33 +0000)]
Merge "Introduce config_disable_uninstall_update flag."
TreeHugger Robot [Wed, 14 Feb 2018 00:14:09 +0000 (00:14 +0000)]
Merge "Add summary for hostspot when airplane is on."
TreeHugger Robot [Tue, 13 Feb 2018 22:51:32 +0000 (22:51 +0000)]
Merge "Mark AccessibilitySettings#update methods as protected."
TreeHugger Robot [Tue, 13 Feb 2018 22:46:07 +0000 (22:46 +0000)]
Merge "Update detector and action for restrict app"
Hemant Gupta [Tue, 13 Feb 2018 22:45:38 +0000 (22:45 +0000)]
Merge "OPP: Prevent sending intent while orientation change" am:
f32fa0b5f6 am:
def626bea0
am:
6385eb1014
Change-Id: I2589be4755ca02d2ff1265607c735ca2cf1332d1
Ben Lin [Thu, 8 Feb 2018 23:53:16 +0000 (15:53 -0800)]
Introduce config_disable_uninstall_update flag.
This adds the following flag:
config_disable_uninstall_update
Which by default is false. When set to true, it will hide the "Uninstall
updates" menu item for all cases.
This is useful for cases where the device OEMs want to allow users to
install apps, but do not want the ability to roll back updates on system
applications.
Bug:
62379281
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AppInfoDashboardFragmentTest
Change-Id: I55fe92467ca95c05f6682174c117031d8295790e
TreeHugger Robot [Tue, 13 Feb 2018 22:31:39 +0000 (22:31 +0000)]
Merge "Remove the battery optimization menu"
jackqdyulei [Tue, 13 Feb 2018 22:21:12 +0000 (14:21 -0800)]
Add summary for hostspot when airplane is on.
Change-Id: I5470dab7050b73ed474abd5b948e873699819751
Fixes:
72716285
Test: RunSettingsRoboTests
Hemant Gupta [Tue, 13 Feb 2018 22:22:23 +0000 (22:22 +0000)]
Merge "OPP: Prevent sending intent while orientation change" am:
f32fa0b5f6
am:
def626bea0
Change-Id: I811e1801a145e9bb010359fdb8c74fb8ca968e7d
Hemant Gupta [Tue, 13 Feb 2018 22:10:34 +0000 (22:10 +0000)]
Merge "OPP: Prevent sending intent while orientation change"
am:
f32fa0b5f6
Change-Id: Id576b0cda560d565d86d6369b7552801cac7b0cd
TreeHugger Robot [Tue, 13 Feb 2018 22:05:32 +0000 (22:05 +0000)]
Merge "Add method to update "state" column in anomaly db."
Treehugger Robot [Tue, 13 Feb 2018 20:43:24 +0000 (20:43 +0000)]
Merge "OPP: Prevent sending intent while orientation change"
Lei Yu [Tue, 13 Feb 2018 20:37:55 +0000 (20:37 +0000)]
Merge "Upgrade the anomaly database."
jackqdyulei [Thu, 8 Feb 2018 18:07:11 +0000 (10:07 -0800)]
Update detector and action for restrict app
1. In detector, read data from database and display it.
2. Update the RestrictAppAction to mark anomaly as handled
if restriction is toggled.
3. Update the RestrictAppTip to handle state change.
Bug:
72385333
Test: RunSettingsRoboTests
Change-Id: I0bbe6f6fd049bf2e7a2bee1dee08d5199f922e31
TreeHugger Robot [Tue, 13 Feb 2018 20:31:48 +0000 (20:31 +0000)]
Merge "[Settings] Remove 'a' from "Set a PIN""
jackqdyulei [Tue, 13 Feb 2018 19:06:26 +0000 (11:06 -0800)]
Remove the battery optimization menu
Change-Id: I129f2c39dba506dabef2cf543e71f70cfd1e7fdf
Fixes:
73189468
Test: Test still pass
Hemant Gupta [Thu, 1 Feb 2018 13:50:29 +0000 (19:20 +0530)]
OPP: Prevent sending intent while orientation change
Steps:
1. Take any photo/picture and share it via Bluetooth
2. Before choosing remote device in Device Picker Activity, rotate
the device.
Expected result:
File transfer should complete after selecting the device.
Actual result:
The dialog "Bluetooth share: File Unknown file not sent" is shown and
file sharing fails.
Fix:
Add configuration related check in manifest to avoid activity restart during
orientation change.
Test: File transferred successfully after step 2
Fixes:
72715713
Change-Id: I045c2940d3788059c9313e5501a7957608d8879c
jackqdyulei [Mon, 12 Feb 2018 21:56:41 +0000 (13:56 -0800)]
Add method to update "state" column in anomaly db.
This state could be "new", "handled" or "auto-handled".
Bug:
72385333
Test: RunSettingsRoboTests
Change-Id: I2e3a9d2d3457f125421467e72f5b734990273abe
jackqdyulei [Tue, 13 Feb 2018 00:14:48 +0000 (16:14 -0800)]
Upgrade the anomaly database.
Add one column for the table. Since the database is not offically
used, we can just simply delete and recreate it.
Bug:
72385333
Test: Build
Change-Id: If999dbccbf168b05f98af5ab389c9e2cbb5ad2e8
TreeHugger Robot [Tue, 13 Feb 2018 11:07:11 +0000 (11:07 +0000)]
Merge "Add content description to suggestion card close button."
TreeHugger Robot [Tue, 13 Feb 2018 11:05:42 +0000 (11:05 +0000)]
Merge "Import translations. DO NOT MERGE"
android-build-team Robot [Tue, 13 Feb 2018 08:38:09 +0000 (08:38 +0000)]
Snap for
4600820 from
9017e45d09765433d37e260d35d164eaee68b0f7 to pi-release
Change-Id: I22a1576301c40605cf1311ff8c8e9f9e662d40cb
TreeHugger Robot [Tue, 13 Feb 2018 04:07:14 +0000 (04:07 +0000)]
Merge "Disable "double tap to check" when "always on""
Jyun LuoLai [Fri, 9 Feb 2018 09:08:52 +0000 (17:08 +0800)]
[Settings] Remove 'a' from "Set a PIN"
Change-Id: Ic854ac0e87d486e3cc2723145e42a8894d7a9faf
Fixes:
72726923
Test: Manual test
Fan Zhang [Tue, 13 Feb 2018 01:08:34 +0000 (01:08 +0000)]
Merge "Change print setting from a dynamic tile to static pref"
Lucas Dupin [Sun, 11 Feb 2018 02:18:19 +0000 (18:18 -0800)]
Disable "double tap to check" when "always on"
"Double tap to check" has no effect when AOD is enabled.
Double tapping will take you to the lock screen anyway.
Test: manual
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DoubleTapScreenPreferenceControllerTest
Change-Id: Ia97b7ecb00a9d83b867959d83642d476841e2f13
Fixes:
73096311
Fan Zhang [Mon, 12 Feb 2018 23:28:13 +0000 (23:28 +0000)]
Merge "Fix intent launch flag"
Fan Zhang [Sat, 10 Feb 2018 00:39:27 +0000 (16:39 -0800)]
Change print setting from a dynamic tile to static pref
...because dynamic tile is a lot harder to index correctly.
- Removed metadata that makes PrintSettings a dynamic tile.
- Added PrintSettings into connected_device xml.
- Added a new PreferenceController - all summary updating logic is
copied from PrintSettingsFragment
Change-Id: I41e7c9d23e97ecd5a043ac7c33f2d404260c92e7
Fixes:
73128944
Test: robotests
Leslie Watkins [Mon, 12 Feb 2018 22:13:48 +0000 (22:13 +0000)]
Merge "Remove all reference to SmsMirroring in Android Settings."
Leslie Watkins [Sat, 10 Feb 2018 00:43:06 +0000 (16:43 -0800)]
Remove all reference to SmsMirroring in Android Settings.
Test: Robotests
Change-Id: I3318c6915cae95522f09838f00a3c567fe9e5fc5
Fan Zhang [Mon, 12 Feb 2018 20:52:17 +0000 (12:52 -0800)]
Fix intent launch flag
Change-Id: I0cb744fcccc6fb9f6d0d338f726f3dd29dccc718
Fixes:
73224739
Test: manual
Bill Yi [Mon, 12 Feb 2018 20:16:59 +0000 (12:16 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6a013e90dc650b43bedc6ce823d9315a7ebcf3e3
Auto-generated-cl: translation import
Doris Ling [Mon, 12 Feb 2018 19:40:03 +0000 (11:40 -0800)]
Add content description to suggestion card close button.
Change-Id: I2354dd5a4b092ac24bbc0c197bd228b73d8ede64
Fixes:
72958040
Test: talkback, make RunSettingsRoboTests
Victor Chang [Mon, 12 Feb 2018 10:38:40 +0000 (10:38 +0000)]
Merge "Use 24-hour settings for time formatting"
android-build-team Robot [Sun, 11 Feb 2018 08:22:47 +0000 (08:22 +0000)]
Snap for
4598635 from
08addde8b5e3f2dbf60df570e67ac5abe5dae8ef to pi-release
Change-Id: I0dd217b846bf0a4ebb0b3e345fbec2f2be8ecc4a
Pavlin Radoslavov [Sat, 10 Feb 2018 09:32:54 +0000 (09:32 +0000)]
Merge "Use proper string formatting for the "Active device" string" am:
f5848d0f4d am:
8018f82e5a
am:
ac8aed2ce8 -s ours
Change-Id: I282150ff2af7dbedd7e0199144ff7a282ffbff5f
Pavlin Radoslavov [Sat, 10 Feb 2018 09:22:38 +0000 (09:22 +0000)]
Merge "Use proper string formatting for the "Active device" string" am:
f5848d0f4d
am:
8018f82e5a
Change-Id: Iaf745544ca349cb5a0193b4dd0e46bcc89ff4e0c
Pavlin Radoslavov [Sat, 10 Feb 2018 09:12:16 +0000 (09:12 +0000)]
Merge "Use proper string formatting for the "Active device" string"
am:
f5848d0f4d
Change-Id: Ic34959c5ca44ad6d0ac06dfb76b3b07cd4bee819
Treehugger Robot [Sat, 10 Feb 2018 02:05:12 +0000 (02:05 +0000)]
Merge "Use proper string formatting for the "Active device" string"
TreeHugger Robot [Sat, 10 Feb 2018 00:31:17 +0000 (00:31 +0000)]
Merge "Add test to verify external account settings is shown."
Pavlin Radoslavov [Thu, 8 Feb 2018 01:23:12 +0000 (17:23 -0800)]
Use proper string formatting for the "Active device" string
Updated testContextMock() how it checks the bluetooth_connected string.
Bug:
72317067
Test: Unit test updated:
make ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest \
RunSettingsRoboTests
Manual: two headsets and switching the active device
Change-Id: I3db178d71543e4dfa437544350c58241860ae703
Merged-In: I3db178d71543e4dfa437544350c58241860ae703
(cherry picked from commit
b58b006e44ecf73ad31f79bade8149df7d903dc3)
TreeHugger Robot [Fri, 9 Feb 2018 22:39:30 +0000 (22:39 +0000)]
Merge "Fix double search icon in wifi calling page"
Doris Ling [Fri, 9 Feb 2018 22:27:06 +0000 (14:27 -0800)]
Add test to verify external account settings is shown.
- add a test service that provides a test authenticator and a test
preference screen. Creates corresponding test account and verifies that
the preferences defined in the authenticator is displayed from the
account detail page.
Change-Id: Iab87177ae500d0a36272cf8ecf464139a3dc07cd
Fixes:
35353708
Test: make SettingsUnitTests
TreeHugger Robot [Fri, 9 Feb 2018 22:13:39 +0000 (22:13 +0000)]
Merge "Increase timeout waiting for suggestions"
Amith Yamasani [Fri, 9 Feb 2018 20:41:59 +0000 (20:41 +0000)]
Merge "Update Inactive Apps screen to show buckets"
Fan Zhang [Fri, 9 Feb 2018 20:24:04 +0000 (12:24 -0800)]
Increase timeout waiting for suggestions
- Experimenting timeout value to figure out what's most common
end-to-end latency for loading suggestions
Change-Id: Icaa3d4d7a45a05380a9521c961e7213e020601a9
Fixes:
69068691
Test: visual
Fan Zhang [Fri, 9 Feb 2018 18:25:55 +0000 (10:25 -0800)]
Fix double search icon in wifi calling page
- Moved fragments into wifi sub-package.
- Cleaned up inheritance for WifiCallingSettings
- Attach help and search action menu controller correctly.
Change-Id: I0bc8ab99df5d8c5ea64fb64de5ae70c2c9bd6f31
Fixes:
72958674
Test: robotest
Victor Chang [Thu, 1 Feb 2018 17:54:16 +0000 (17:54 +0000)]
Use 24-hour settings for time formatting
Test: m RunSettingsRoboTests
Bug:
72311296
Change-Id: I7c1458dbc2e4e15765f703c35a0113341b912a2b
TreeHugger Robot [Fri, 9 Feb 2018 01:35:18 +0000 (01:35 +0000)]
Merge changes Ib3d3df9f,Iae9096a1
* changes:
Use BatterySaverReceiver in battery saver settings
Add controller for battery saver button
TreeHugger Robot [Fri, 9 Feb 2018 00:11:41 +0000 (00:11 +0000)]
Merge "Add test to verify Users settings shows in secondary user."
TreeHugger Robot [Thu, 8 Feb 2018 23:24:49 +0000 (23:24 +0000)]
Merge "Fix developer option not being enabled."
jackqdyulei [Tue, 6 Feb 2018 22:03:30 +0000 (14:03 -0800)]
Use BatterySaverReceiver in battery saver settings
Use this receiver to listen to following updates:
1. Plug state: if it is plugged in, disable this two state
button, otherwise make it enabled
2. low power mode: If mode on, show "turn off" otherwise show
"turn on"
Bug:
72228477
Test: RunSettingsRoboTests
Change-Id: Ib3d3df9f9a5fbac8b1b876c9e193beb75f522ebd
jackqdyulei [Thu, 25 Jan 2018 03:42:42 +0000 (19:42 -0800)]
Add controller for battery saver button
Bug:
72228477
Test: RunSettingsRoboTests
Change-Id: Iae9096a10553ea761d099e1e72c1de56b693bac0
TreeHugger Robot [Thu, 8 Feb 2018 22:47:52 +0000 (22:47 +0000)]
Merge "Use proper string formatting for the "Active device" string"
Doris Ling [Thu, 8 Feb 2018 01:28:43 +0000 (17:28 -0800)]
Add test to verify Users settings shows in secondary user.
- also update launch sequence for Users settings tests as Users settings
has been moved inside system settings and the preference title has
changed.
- and change the test to run with AndroidJUnit4.
Change-Id: I049b83f9ae4b2724608af267e8900dd9e6749874
Fixes:
34774778
Test: make SettingsUnitTests
Fan Zhang [Thu, 8 Feb 2018 21:51:50 +0000 (21:51 +0000)]
Merge "Move restriction check for dev settings into controller"
Doris Ling [Thu, 8 Feb 2018 21:17:54 +0000 (13:17 -0800)]
Fix developer option not being enabled.
- when screen lock is set, we will start the activity to check user's
credential. Override onActivityResult() and call BuildNumberPreferenceController's
method accordingly, so that we will checks the password confirm result and enable
the developer options if it is success.
Change-Id: Ie2df644c53430ad4eb394480348d956177804ec3
Fixes:
73102865
Test: make RunSettingsRoboTests
TreeHugger Robot [Thu, 8 Feb 2018 20:43:50 +0000 (20:43 +0000)]
Merge "Update task affinity and parent activity for all exported activities."
TreeHugger Robot [Thu, 8 Feb 2018 20:20:33 +0000 (20:20 +0000)]
Merge "Don't use debug data in app list controller"
TreeHugger Robot [Thu, 8 Feb 2018 19:46:26 +0000 (19:46 +0000)]
Merge "Add Toggle Controllers to XML"
Pavlin Radoslavov [Thu, 8 Feb 2018 01:23:12 +0000 (17:23 -0800)]
Use proper string formatting for the "Active device" string
Updated testContextMock() how it checks the bluetooth_connected string.
Bug:
72317067
Test: Unit test updated:
make ROBOTEST_FILTER=BluetoothDetailsHeaderControllerTest \
RunSettingsRoboTests
Manual: two headsets and switching the active device
Change-Id: I3db178d71543e4dfa437544350c58241860ae703
Fan Zhang [Thu, 8 Feb 2018 01:32:17 +0000 (17:32 -0800)]
Update task affinity and parent activity for all exported activities.
This is needed to fix nav-up button for these activities.
- Change taskAffinity for homepage to "com.android.settings.root".
- Change taskAffinity for many activities to "com.android.settings", and
set partent to homepage.
-- General rule: if activity has not been exported, don't set
affinity or parent.
-- If activity is exported and can be launched with an action, set
affinity and parent to homepage
-- If activity is exported but expects additional parameters, don't
set affinity or parent.
-- If the activity affinitiy is com.android.setupwizard, don't touch
it.
With this change, when a setting page is launched via intent (eg, from
QS), nav up button will be able to find parentActivity, and launch it in
a different task affinity. If the acitivity is a launched within
settings, nav-up has no change, it just navigates back to where it came from.
Change-Id: I3a2b64ed13d437f6818f6c7374e994b4192b6fa0
Fixes:
72337421
Fixes:
72829142
Test: manual
Test: atest
jackqdyulei [Thu, 8 Feb 2018 18:12:34 +0000 (10:12 -0800)]
Don't use debug data in app list controller
This is a bug, USE_FAKE_DATA should never be true in build
Change-Id: I14059cd243380c754ca0cff09f088d62828ec755
Fixes:
73117246
Test: Build
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"
android-build-team Robot [Thu, 8 Feb 2018 08:23:18 +0000 (08:23 +0000)]
Snap for
4593582 from
c9f1d89dd36e1201255c297ee64d7b5b611144f3 to pi-release
Change-Id: I8f11907bf7f34440a90661b266ed79829392f436
Lei Yu [Thu, 8 Feb 2018 07:54:25 +0000 (07:54 +0000)]
Merge "Make ConnectedDevice page handles bt intent"
Fan Zhang [Wed, 7 Feb 2018 20:59:22 +0000 (12:59 -0800)]
Move restriction check for dev settings into controller
Change-Id: I99dae6e82aca40b92e1965ba7db2c54f3c59d33f
Fixes:
72815875
Test: robotests
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
Ben Lin [Wed, 7 Feb 2018 18:32:40 +0000 (10:32 -0800)]
Mark AccessibilitySettings#update methods as protected.
Bug:
62387367
Test: None
Change-Id: Ie70c8b167f8e61210fddb8f370c1ac0481b58f0c
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"