Commit Graph

42876 Commits

Author SHA1 Message Date
jackqdyulei
a2df26e9b3 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
2018-02-08 15:22:27 -08:00
jackqdyulei
92757b2454 Add controller for battery saver button
Bug: 72228477
Test: RunSettingsRoboTests
Change-Id: Iae9096a10553ea761d099e1e72c1de56b693bac0
2018-02-08 15:19:00 -08:00
TreeHugger Robot
1dd690198f Merge "Use proper string formatting for the "Active device" string" 2018-02-08 22:47:52 +00:00
Doris Ling
7459f40bfd 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
2018-02-08 14:06:23 -08:00
Fan Zhang
39a5eb5f20 Merge "Move restriction check for dev settings into controller" 2018-02-08 21:51:50 +00:00
Doris Ling
e0014e2234 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
2018-02-08 13:17:54 -08:00
TreeHugger Robot
ce21e7a978 Merge "Update task affinity and parent activity for all exported activities." 2018-02-08 20:43:50 +00:00
TreeHugger Robot
eab75df8fa Merge "Don't use debug data in app list controller" 2018-02-08 20:20:33 +00:00
TreeHugger Robot
f94f6d41d9 Merge "Add Toggle Controllers to XML" 2018-02-08 19:46:26 +00:00
Pavlin Radoslavov
b58b006e44 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
2018-02-08 11:14:10 -08:00
Fan Zhang
db26cfb847 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
2018-02-08 11:04:35 -08:00
jackqdyulei
88c86f73bb 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
2018-02-08 10:25:24 -08:00
Jan Nordqvist
4fbe0f8354 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
2018-02-08 10:13:42 -08:00
TreeHugger Robot
525d757c09 Merge "Apply checkbox enable state on viewholder bind" 2018-02-08 17:00:59 +00:00
Lei Yu
2c93b07168 Merge "Make ConnectedDevice page handles bt intent" 2018-02-08 07:54:25 +00:00
Fan Zhang
155d6829e9 Move restriction check for dev settings into controller
Change-Id: I99dae6e82aca40b92e1965ba7db2c54f3c59d33f
Fixes: 72815875
Test: robotests
2018-02-07 22:33:10 -08:00
TreeHugger Robot
c9f1d89dd3 Merge "Remove dead code for DataPlanUsageSummary" 2018-02-08 06:21:11 +00:00
TreeHugger Robot
a0ee8ad070 Merge "Remove some dead code from search" 2018-02-08 06:13:36 +00:00
TreeHugger Robot
682bb3e8e5 Merge "Add feature flag for new DataUsageSummary fragment." 2018-02-08 04:55:56 +00:00
TreeHugger Robot
547e9403dc Merge "Move old battery settings page to dev options" 2018-02-08 04:48:22 +00:00
Fan Zhang
3ed55b1450 Remove dead code for DataPlanUsageSummary
This is an unfinished feature, no longer needed.

Change-Id: I358dcc8865184117d49e35b3e8dfcd84403261d0
Fixes: 73073608
Test: rebuild
2018-02-07 20:35:56 -08:00
jackqdyulei
6dd7f2eb38 Make ConnectedDevice page handles bt intent
Fixes: 73088883
Test: Manual - click the bt tile in quick settings
Change-Id: I147a9a83b37fff4a7573f792cd9172fef84110f2
2018-02-07 17:57:40 -08:00
Matthew Fritze
700c113218 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
2018-02-07 17:09:05 -08:00
Fan Zhang
d75baf7e85 Remove some dead code from search
Test: rebuild
Change-Id: If736f58c546fa9eafc405525c11640ca2576d446
2018-02-07 16:56:28 -08:00
jackqdyulei
6cbe94c1c5 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
2018-02-07 16:53:17 -08:00
TreeHugger Robot
96fc83d821 Merge "Delete WPS settings." 2018-02-08 00:16:35 +00:00
Julia Reynolds
cd7e9bcb33 Apply checkbox enable state on viewholder bind
Change-Id: I5b263f02fb6a1779fd567eade3776044fddb6b11
Fixes: 72809700
Test: SettingsRoboTests
2018-02-07 23:58:44 +00:00
TreeHugger Robot
b1c7b88f10 Merge "Update style switchbar layout" 2018-02-07 23:04:44 +00:00
TreeHugger Robot
1ea9eeb9c6 Merge "Notification lock screen setting updates" 2018-02-07 22:38:32 +00:00
Eric Schwarzenbach
98998a2fcc 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
2018-02-07 14:29:41 -08:00
tiansiming [田思明]
3d38ab00cb Merge "Fix NPE in AutoSyncWorkDataPreferenceController" am: cdd628e6e4 am: 0bc6b461be
am: eb0ebc6b98

Change-Id: I12a16dd3ef5cfcda92efd166d3f2fccdd20527d1
2018-02-07 22:19:31 +00:00
tiansiming [田思明]
eb0ebc6b98 Merge "Fix NPE in AutoSyncWorkDataPreferenceController" am: cdd628e6e4
am: 0bc6b461be

Change-Id: I78899aef7b43c067f7c4094d7de63b95c4ee3f11
2018-02-07 22:16:46 +00:00
TreeHugger Robot
87ed226f37 Merge "Update copy for battery estimate related features" 2018-02-07 22:15:29 +00:00
tiansiming [田思明]
0bc6b461be Merge "Fix NPE in AutoSyncWorkDataPreferenceController"
am: cdd628e6e4

Change-Id: Ic10709693acbf3f04704ed76a7474291af509cf5
2018-02-07 22:13:14 +00:00
TreeHugger Robot
a33144b841 Merge "Pre-fixup for nav up button" 2018-02-07 22:05:39 +00:00
Treehugger Robot
cdd628e6e4 Merge "Fix NPE in AutoSyncWorkDataPreferenceController" 2018-02-07 22:01:51 +00:00
Andrew Sapperstein
26e35dac79 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
2018-02-07 13:57:57 -08:00
Julia Reynolds
095fb16ed7 Update style switchbar layout
Test: manual
Change-Id: If1aaffe0ea7790603291ba412500e47efa6b7b3e
Fixes: 72424821
Fixes: 72423465
2018-02-07 20:50:24 +00:00
TreeHugger Robot
d0d7322138 Merge "Modify logging in WifiSettings." 2018-02-07 20:24:38 +00:00
Salvador Martinez
408dc41228 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
2018-02-07 10:55:15 -08:00
Ben Lin
90e070d8c5 Mark AccessibilitySettings#update methods as protected.
Bug: 62387367
Test: None
Change-Id: Ie70c8b167f8e61210fddb8f370c1ac0481b58f0c
2018-02-07 10:32:40 -08:00
Fan Zhang
f11c885766 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
2018-02-07 10:27:18 -08:00
TreeHugger Robot
d7557125c6 Merge "Call super.onDestroy in ResetNetworkConfirm fragment" 2018-02-07 17:58:43 +00:00
Julia Reynolds
826e6c4b9a 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
2018-02-07 16:34:49 +00:00
TreeHugger Robot
9a922cf6b8 Merge "Change character limit for condition_zen_title" 2018-02-07 16:23:16 +00:00
Beverly
0d2fcea688 Change character limit for condition_zen_title
Change-Id: I187e859bd010a746acea8953be88687df8758a54
Fixes: 73018789
Test: n/a
2018-02-07 09:23:54 -05:00
TreeHugger Robot
d895f9374c Merge "Remove the second target for ConnectedApPreference" 2018-02-07 05:06:23 +00:00
TreeHugger Robot
a331bbd576 Merge "Remove the click action for battery header" 2018-02-07 04:26:54 +00:00
jackqdyulei
e5a4276912 Remove the click action for battery header
Also remove the ripple effect

Change-Id: I28c3dc928816f07a18591c0777b5b2f275715ca2
Fixes: 73018312
Test: Build
2018-02-06 18:24:38 -08:00
Lei Yu
f8caf69d46 Merge changes from topic "battery_saver_step_1"
* changes:
  Add preference controller for battery seekbar
  Revamp the battery saver page
2018-02-07 02:07:54 +00:00