Commit Graph

36767 Commits

Author SHA1 Message Date
Suprabh Shukla
3aeffe5e9d Merge "Always returning the updated preference summary" 2017-06-02 18:51:10 +00:00
Alison Cichowlas
f62c6372e8 Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev
am: e811873b4e

Change-Id: Ia4def66e47faf702c22a4e3aba04d52965052aa8
2017-06-02 18:49:29 +00:00
TreeHugger Robot
e811873b4e Merge "Delay adding app settings link until data fetch returns, to avoid reordering/visible misplaced "additional settings in the app" during transition." into oc-dev 2017-06-02 18:42:25 +00:00
TreeHugger Robot
3c292444b0 Merge "Simplify InlineSwitchPayloads and generalize get/set method" 2017-06-02 18:06:49 +00:00
jackqdyulei
ee01dcc74a Restart loader in onResume
We need to refresh batterystatsHelper in onResume, so we need to
call restartLoader instead of initLoader

Bug: 62237848
Test: RunSettingsRoboTests
Change-Id: I6f7e1b57b945c92d34587ca24db192600e7f797f
Merged-In: I6f7e1b57b945c92d34587ca24db192600e7f797f
2017-06-02 10:21:32 -07:00
Peter Qiu
1fcb026a3a wifi: use WifiSavedConfigUtils to retrieve saved configurations
Bug: 62048284
Test: manual test
Change-Id: Ib1719af1b256020bbf57d07ebe8c29ac1c460c1a
2017-06-02 17:16:54 +00:00
Lei Yu
f91dc2b064 Merge "Refine the ProgressCategory" into oc-dev am: 5f4f1b81af
am: f2379e2ed3

Change-Id: Ibc809ffa4740e9f4a51975c4cdc94b5ff3f4643a
2017-06-02 17:16:53 +00:00
Lei Yu
f2379e2ed3 Merge "Refine the ProgressCategory" into oc-dev
am: 5f4f1b81af

Change-Id: I2b0fda608b8fe33eaa8ba6e7580c3becc1ebad71
2017-06-02 17:13:55 +00:00
Lei Yu
5f4f1b81af Merge "Refine the ProgressCategory" into oc-dev 2017-06-02 17:08:45 +00:00
Alison Cichowlas
5cdcb40cd3 Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev am: 3efc502840
am: 5698552021

Change-Id: Ib0a9db86ea0191c4cd487842eb9ce49b9e6db2e0
2017-06-02 17:02:30 +00:00
Alison Cichowlas
5698552021 Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev
am: 3efc502840

Change-Id: Ib9006beaec685ef91583278585c9522f995d3c09
2017-06-02 16:56:59 +00:00
TreeHugger Robot
3efc502840 Merge "Disallow buzz/beep/disturb changes for notifications with locked importance." into oc-dev 2017-06-02 16:46:52 +00:00
Alison Cichowlas
1765820203 Merge "Add group name into channel summary, if applicable." into oc-dev am: 4b29f593f0
am: b143e15dd1  -s ours

Change-Id: I74811fefac1d831c4f851bfa783b1e0aee20f41a
2017-06-02 16:37:50 +00:00
Alison Cichowlas
b143e15dd1 Merge "Add group name into channel summary, if applicable." into oc-dev
am: 4b29f593f0

Change-Id: Ia4c0c9a506894033471b563f89e02a35cbf25601
2017-06-02 15:48:25 +00:00
Alison Cichowlas
4b29f593f0 Merge "Add group name into channel summary, if applicable." into oc-dev 2017-06-02 15:39:44 +00:00
Matthew Fritze
2b1a88da3d Simplify InlineSwitchPayloads and generalize get/set method
InlineSwitchPayload now assumes that all switches will be
stored as 1 or 0, which simplifies the code.

Moves Availability into ResultPayload, so that custom
payloads can be created to set/get values which are more
complicated than stotring ints (like bluetooth or DnD),
and give more expressive reasons when unavailable.

Bug: 62022517
Test: make RunSettingsRoboTests
Change-Id: I87e6fc041bfd398e7daf6e6e479d502930d36f0f
2017-06-02 08:23:45 -07:00
Bartosz Fabianowski
09ddef953b Hide "Changes made by your organization's admin" when empty am: 493495452a
am: 98b216dc05  -s ours

Change-Id: Icd55cf9ce8a18578be783d057bd92a8ebdf639e0
2017-06-02 13:34:12 +00:00
Bartosz Fabianowski
98b216dc05 Hide "Changes made by your organization's admin" when empty
am: 493495452a

Change-Id: Ided6278456fe5ffdbb843717a1ec7070e7a3d3dc
2017-06-02 13:30:12 +00:00
Bartosz Fabianowski
493495452a Hide "Changes made by your organization's admin" when empty
The admin of a manged device can take a number actions that will be
listed in the "Changes made by your organization's admin" section of
Settings. If the admin has not taken any such actions, the section
will be empty and should be hidden. This is accomplished by having a
PreferenceController for the section that observes the state of the
PreferenceControllers inside it.

Bug: 35912953
Test: m RunSettingsRoboTests

Merged-in: Ia95754493ee6c5a19b4aa9731fd56fd558e61849

Change-Id: I82ca00b757001390f9a517b0c07057bdc49dab20
2017-06-02 13:45:40 +02:00
Bartosz Fabianowski
55038c0a95 Hide "Changes made by your organization's admin" when empty
The admin of a manged device can take a number actions that will be
listed in the "Changes made by your organization's admin" section of
Settings. If the admin has not taken any such actions, the section
will be empty and should be hidden. This is accomplished by having a
PreferenceController for the section that observes the state of the
PreferenceControllers inside it.

Bug: 35912953
Test: m RunSettingsRoboTests

Change-Id: Ia95754493ee6c5a19b4aa9731fd56fd558e61849
2017-06-02 11:40:41 +02:00
Lorenzo Colitti
beafc36360 Minor tweaks to WifiDetailPreferenceControllerTest.
Add makeNetworkCapabilities and updateNetworkCapabilities
methods, and use them. These are not very useful in the current
code but we introduce in their own CL to limit test changes in an
upcoming CL that will make use them to test new code.

Bug: 62209358
Test: make -j64 RunSettingsRoboTests
Change-Id: I67269e1add40ecb3c2b693548e8bf29ae776a79f
2017-06-02 17:56:52 +09:00
Esteban Talavera
c62ce670c3 Merge "Include disabled managed profiles in Accounts page" into oc-dev am: 92f78354f9
am: 42d97f86c2

Change-Id: If2708bc27673b50dfdf7faa3300944d8bdb47b60
2017-06-02 08:42:50 +00:00
Esteban Talavera
42d97f86c2 Merge "Include disabled managed profiles in Accounts page" into oc-dev
am: 92f78354f9

Change-Id: I3dc5fd6bb4c7466b204946db179b10d9a3c9ccdf
2017-06-02 08:38:51 +00:00
Esteban Talavera
92f78354f9 Merge "Include disabled managed profiles in Accounts page" into oc-dev 2017-06-02 08:33:17 +00:00
Lorenzo Colitti
5692d23042 Merge changes from topic 'wifi_detail_jank' into oc-dev am: 0187221bd8
am: cc347f4e14

Change-Id: Idf82b916ae8121b837b7113af7ab182640124814
2017-06-02 06:27:13 +00:00
Lorenzo Colitti
cc347f4e14 Merge changes from topic 'wifi_detail_jank' into oc-dev
am: 0187221bd8

Change-Id: I7873b3f06b40e416b89b44615e9fe28a5b3c7a29
2017-06-02 06:18:13 +00:00
TreeHugger Robot
0187221bd8 Merge changes from topic 'wifi_detail_jank' into oc-dev
* changes:
  Reduce jank in the wifi detail status page.
  Improve testing of IP address display code.
2017-06-02 06:11:52 +00:00
Sheng Wang
700369444a Volume can not be updated in Sound&notification am: 8c329af634
am: d453911e27

Change-Id: I2bfd519b3d52f6e699d2d9a3be4753381821ce25
2017-06-02 04:32:10 +00:00
Sheng Wang
d453911e27 Volume can not be updated in Sound&notification
am: 8c329af634

Change-Id: I8031a9bbe82b40e79698e9d6be75bcd85bcde028
2017-06-02 04:29:05 +00:00
TreeHugger Robot
d2cf668700 Merge "Make BatterySettings Asynchronous and use enhanced estimate" 2017-06-02 02:48:23 +00:00
TreeHugger Robot
27fffa4cd9 Merge "Update string for recent apps." 2017-06-02 02:39:31 +00:00
TreeHugger Robot
683a3bf4eb Merge "Check for null mReadOnlyApnTypes." 2017-06-02 01:18:22 +00:00
Salvador Martinez
9cfa7720f4 Make BatterySettings Asynchronous and use enhanced estimate
this CL changes BatteryInfo methods to all use the async style
callback approach it had for one of the methods. Non-async methods
are now annotated to only be used in worker threads. BatteryInfo
can now be obtained via callback by calling one of the async
methods. Alternatively if there is a worker thread available
the synchronous methods similar to the old ones can be used.

The callback methods have all been changed so that they cascade to a
async method that takes all the required info as paremeters. This
will minimize the amount of churn in files that currently use
BatteryInfo.

A new loader was created that can be used to get BatteryInfo in
places that wish to get it. This loader is used in
PowerUsageSummary to get the BatteryInfo.

Test: Robotests
Bug: 38399275
Bug: 38398949
Bug: 38399654
Change-Id: Ic5a82d8ca4c85fad1b883226327ec083badf861d
2017-06-01 18:03:53 -07:00
Doris Ling
2c80b4fc3a Update string for recent apps.
Bug: 62273254
Test: builds
Change-Id: I57a06b4bdfaa9c41636baeddcb94c71bf4518ebc
2017-06-01 17:58:04 -07:00
Sheng Wang
fd1a02d914 Merge "Volume can not be updated in Sound&notification" am: c0fdbab185 am: 161e3d14e1 am: 9dbd34a3d9
am: 61a420df95

Change-Id: I0ed31e1c4e8b1a74a2aca2288876ca57f05ca79c
2017-06-02 00:57:09 +00:00
TreeHugger Robot
db42c2650d Merge "Don't index High usage summary" 2017-06-02 00:41:12 +00:00
TreeHugger Robot
ec3e297453 Merge "Restart loader in onResume" 2017-06-02 00:32:23 +00:00
Sheng Wang
61a420df95 Merge "Volume can not be updated in Sound&notification" am: c0fdbab185 am: 161e3d14e1
am: 9dbd34a3d9

Change-Id: I50a30452b6e0162070960ffdc35197ddef785609
2017-06-02 00:27:56 +00:00
Sheng Wang
9dbd34a3d9 Merge "Volume can not be updated in Sound&notification" am: c0fdbab185
am: 161e3d14e1

Change-Id: Ie08f168cc2bf544d1f44a05f100a47d50ae15dd5
2017-06-02 00:25:17 +00:00
Sheng Wang
161e3d14e1 Merge "Volume can not be updated in Sound&notification"
am: c0fdbab185

Change-Id: I467cb1cc5e0dbe49e383c7eace0be4475c21f762
2017-06-02 00:21:45 +00:00
Treehugger Robot
c0fdbab185 Merge "Volume can not be updated in Sound&notification" 2017-06-02 00:14:16 +00:00
Amit Mahajan
7243db2572 Check for null mReadOnlyApnTypes.
Test: none
Bug: 62247121
Change-Id: I6866bf2df8d4cb46dd75b94ab88c1e62e65ddda7
2017-06-01 16:39:40 -07:00
TreeHugger Robot
31d5b3de6f Merge "Add strings in battery usage page" 2017-06-01 23:38:43 +00:00
Sheng Wang
8c329af634 Volume can not be updated in Sound&notification
After "onActivityPause()" is invoked and "onActivityResume()"
is invoked again, "mVolumizer" is not empty object,
so volume is not updated.

To fix this issue, set "mVolumizer" is null in "onActivityPause()",
if "onActivityResume()" is invoked again, recreate "mVolumizer"
and update volume.

Bug: 37558283
Test: manual, cherrypicking from AOSP
Change-Id: Id91064ea32305b5bf203f34e31988ac923beee6d
2017-06-01 16:35:03 -07:00
Suprabh Shukla
7e59ec499c Always returning the updated preference summary
AppEntry is not being updated when opening nested app info activities,
which led to stale preference summary being returned for external
sources details.

Test: Manually checked the preference summary is correctly reflecting
the state of the switch.
Existing test ExternalSourcesSettingsTest passes.

Bug: 37487637
Change-Id: Id3c665c7cc7231023f4110725b3b15e43284de97
2017-06-01 15:58:24 -07:00
TreeHugger Robot
34494a53c9 Merge "Add group name into channel summary, if applicable." 2017-06-01 22:57:26 +00:00
jackqdyulei
210110f4ed Restart loader in onResume
We need to refresh batterystatsHelper in onResume, so we need to
call restartLoader instead of initLoader

Bug: 62237848
Test: RunSettingsRoboTests
Change-Id: I6f7e1b57b945c92d34587ca24db192600e7f797f
2017-06-01 15:57:08 -07:00
Antony Sargent
ede1e7f16a Add strings to use in Bluetooth device forget confirmation
We're going to add a confirmation dialog for when the user chooses to
unpair with (or "forget") a Bluetooth device on the device details
page. These are the strings we'll use in the dialog.

Bug: 37955181
Bug: 35876580
Test: (should be covered by existing tests)
Change-Id: Iec08fcc2730129c0e9a8f54cc94ab8aad958f353
2017-06-01 15:55:42 -07:00
jackqdyulei
d5e20e14af Refine the ProgressCategory
1. Make the progressbar align with settings gear
2. Make text vertical center

Bug: 37190885
Test: Screenshot
Change-Id: Ib69b949179a0e097b78717cbe93c39aa0064ea9e
2017-06-01 15:48:56 -07:00
TreeHugger Robot
8da7a39697 Merge "Update strings for anomaly detection" 2017-06-01 22:46:12 +00:00