Commit Graph

16429 Commits

Author SHA1 Message Date
jackqdyulei
d10608dfbb Hide wifi and bt in battery settings
Hide them in app usage list but don't smear them

Bug: 62787787
Test: RunSettingsRoboTests
Change-Id: I43c15ea8a2b32f293eb859f3fead8666e45674ef
2017-06-20 13:44:52 -07:00
Alison Cichowlas
80fa6b5833 Limit unconfigurability to specified channels.
Bug: 62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
2017-06-12 23:17:11 +00:00
Antony Sargent
d77b699e60 Merge "Set advanced battery usage items as non-selectable" into oc-dev 2017-06-09 15:41:27 +00:00
TreeHugger Robot
4f02eebab8 Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev 2017-06-09 08:29:57 +00:00
jackqdyulei
82fcadad65 Make flag "showAllapps" persistent in PowerUsageSummary
This flag is used to decide whether to show all the apps
(including system app, service..) in battery settings

Handle it in onCreate() and onSaveInstanceState()

Bug: 62422948
Test: RunSettingsRoboTests
Change-Id: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
Merged-In: I30c0d6e1e25902f1192fc2564aa09d635b5e0f4f
2017-06-08 21:49:15 -07:00
TreeHugger Robot
031b90541f Merge "Update subtitle for apps in battery settings" into oc-dev 2017-06-09 02:53:36 +00:00
TreeHugger Robot
2a32cb6a33 Merge "Search results always highlight proper results" into oc-dev 2017-06-09 01:19:38 +00:00
Matthew Fritze
33f3e3f4f7 Search results always highlight proper results
In fragments where preferences were being injected after
the super#onResume, the incorrect preference was
being highlighted as the selected result.

This is because the index of the preference is calculated
in SettingsPreferenceFragment#onResume, but the index is
not checked again before the item is highlighted.

Instead, we calculate index right before we highlight.

Change-Id: Idaa655f682a1a6186c1996fb51d352589bbeda0f
Fixes: 62179739
Test: runtest --path packages/apps/Settings/tests/app/src/com/android/settings/SettingsPreferenceFragmentTest.java
2017-06-08 16:25:52 -07:00
jackqdyulei
dcea4e894e Update subtitle for apps in battery settings
1. If it is a normal app, show "Screen usage TIME"
2. If it is a hidden app, show "TIME"

Note that in this case the item screen will show "TIME"

Bug: 62422404
Test: RunSettingsRoboTests
Change-Id: Ie8d6caf998d18994ac158f0217109c0e5e9f92ba
2017-06-08 12:52:48 -07:00
Daniel Nishi
e1571b8dac Update the music files icon.
Change-Id: Id1c933e395131ca6e9e9268d7c42f7324aa6fdac
Fixes: 62291640
Test: Manual
2017-06-08 10:24:14 -07:00
TreeHugger Robot
f5f51c4cf2 Merge "Use default package in BatteryEntry" into oc-dev 2017-06-08 02:10:30 +00:00
TreeHugger Robot
9f2f9e331f Merge "Hide Display Theme from search results when not available" into oc-dev 2017-06-07 20:39:38 +00:00
jackqdyulei
a64839b59d Use default package in BatteryEntry
Before this cl, we use the first package name if there is a name
list in BatterySipper.

We should use BatteryEntry.defaultPackageName instead, which could
describle the batterysipper more accurately.

Bug: 62417935
Test: RunSettingsRoboTests
Change-Id: I44fa151c0cf8f14cba305f179c7e94e5bc3ce434
2017-06-07 13:20:47 -07:00
Matthew Fritze
ac5956a5cf Hide Display Theme from search results when not available
Test: make RunSettingsRoboTests
Fixes: 62377986
Change-Id: I5d0737034ef3f845e790934465b65a5415654822
2017-06-07 16:21:44 +00:00
Antony Sargent
e28dfea13b Set advanced battery usage items as non-selectable
The items in the ListView for the Advanced battery usage screen should
not ripple when touched, since these items don't do anything.

Bug: 38019330
Test: make RunSettingsRoboTests
Change-Id: I987a770f0f146b02bbf947238be7490e8a170feb
2017-06-06 17:12:17 -07:00
TreeHugger Robot
f702e39156 Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev 2017-06-06 23:52:49 +00:00
TreeHugger Robot
9fa5e66a66 Merge "If two groups are posted to settings, remove old group and log." into oc-dev 2017-06-06 23:34:44 +00:00
Lorenzo Colitti
85395155fb Merge "Wifi details: minor ordering fixes." into oc-dev 2017-06-06 22:24:43 +00:00
Alison Cichowlas
130a028f33 If two groups are posted to settings, remove old group and log.
Bug: 62136650
Test: manual: set debugger in asynctask at line 110 to force
race condition, triggered task twice then released both.
also ran existing tests with no new failures.
Change-Id: I8508fe9f191ca6cd0bb6dfbc62d884420d3fd747
2017-06-06 17:02:23 -04:00
TreeHugger Robot
dfc1983601 Merge "Revert "Initial search bar implementation."" into oc-dev 2017-06-06 19:04:26 +00:00
TreeHugger Robot
2046c59b77 Merge "Check for dynamic summaries at display time for search" into oc-dev 2017-06-06 18:52:31 +00:00
TreeHugger Robot
37f87b6c64 Merge "Revert "Add search bar to SearchActivity."" into oc-dev 2017-06-06 18:42:25 +00:00
William Luh
5264b00d13 Use the standard place holder for the security summary. DO NOT MERGE
This removes the jitter when the cache is empty and there is
initially no summary, and then it is replaced by the fetched summary
when it's available.

Bug:36463348
Test: make RunSettingsRoboTests
Change-Id: I92cafbf23e3c562a470488dea28fd5106bbdf885
2017-06-06 11:00:49 -07:00
TreeHugger Robot
b8028f63ec Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev 2017-06-06 17:44:23 +00:00
Daniel Nishi
b5abb2c1d2 Merge "Band aid to fix overly long text in donut." into oc-dev 2017-06-06 17:34:01 +00:00
Andrew Sapperstein
a0e816d9d3 Revert "Initial search bar implementation."
This reverts commit 14934599dd.

Bug: 37477506
Change-Id: I510b9a71dd3f19a3d2194da1f4d8f8060d0a4935
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
2017-06-06 17:30:17 +00:00
Andrew Sapperstein
61353aa4fd Revert "Add search bar to SearchActivity."
This reverts commit fac61b71e5.

Bug: 37477506
Change-Id: I1ee66999fbb28b03feb5a51c7146f31a71c1252a
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-06 17:29:41 +00:00
Matthew Fritze
ed761c4e74 Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""
This reverts commit c1e9f8787f.

Reason for revert: There is an issue when dropdown menu text has a '%' sign in it.
Despite testing it on my own devices, the bug did not show up immediately.

Instead of continuing down this path for OC, we'll just revert
this patch, and then as an ugly, band-aid solution, check the
summary text for the "%s" substring, and hide it when found.
In O-DR onward, we'll look for a more permanent solution.

Change-Id: Ia7a04bfb7b09c436dc0f13564f2134a1f0c436e2
Bug: 36101902
Fix: 62211676
2017-06-06 17:20:30 +00:00
Matthew Fritze
0b4b716627 Check for dynamic summaries at display time for search
In order to hide dynamic summaries which use SettingPref,
we check if the summary is equal to "%s".

This is a temporary, band-aid fix which should be
changed in the next release.

Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: I6cadb3ba68f09ba18ad9a6d2a817804c5d4a08e5
2017-06-06 08:34:16 -07:00
Lorenzo Colitti
088215d877 Wifi details: minor ordering fixes.
1. Set mNetwork before the NetworkCallbacks can be delivered.
   Previously, the code would set mNetwork in updateInfo, relying
   on the fact that the BroadcastReceiver registered in onResume
   is immediately invoked. However, this races with the
   callbacks, which are also immediately invoked. If the
   callbacks won the race, mNetwork would not be set and they
   would be ignored.

2. Call updateInfo in onResume instead of in displayPreference.
   This ensures that it's always called exactly once before the
   activity starts running, regardless of whether it's being
   displayed the first time (i.e., after onStart) or resumed
   by switching from another app. displayPreference is only
   called in the former case.

3. Don't call getLinkProperties and getNetworkCapabilities in
   updateInfo. These calls are superfluous, because this
   information is update by the NetworkCallbacks, and they can
   cause jank because updateInfo is called on the UI thread.

This requires that the tests be changed so they always call
onResume, since no UI elements are populated until onResume is
called.

Bug: 62209358
Test: make -j64 RunSettingsRoboTests
Change-Id: Iccb1b9ae51188755d890a6df83004dbe9bec565e
2017-06-06 11:39:17 +09:00
TreeHugger Robot
8fbb0bc1f2 Merge "Make footer preferences non-clickable by default" into oc-dev 2017-06-06 01:54:00 +00:00
Lorenzo Colitti
4249a7092b Merge changes I23540440,I67269e1a into oc-dev
* changes:
  When validation state changes, update the AP summary.
  Minor tweaks to WifiDetailPreferenceControllerTest.
2017-06-06 01:22:08 +00:00
TreeHugger Robot
051a83d909 Merge "Also update flip camera settings for managed profile." into oc-dev 2017-06-06 01:12:29 +00:00
Doris Ling
fed8ea8bce Also update flip camera settings for managed profile.
When user update the setting for flip camera, check if there is managed
profile for the user, and update the setting for the managed user id as
well, so that the work profile camera app can read the correct setting
value.

Change-Id: I757041289329870311bc8473b19fd49ecdd0fadb
Fix: 62078588
Test: make RunSettingsRoboTests
2017-06-05 16:27:12 -07:00
Doris Ling
f38ed2fbb2 Remove call to WifiManager.setWifiApEnabled().
- replace it with ConnectivityManager.stopTethering() instead.

Change-Id: I112863b1be37c0fef5d59c16d73f0c6cf71c6dea
Fix: 62191978
Test: make RunSettingsRoboTests
2017-06-05 23:00:46 +00:00
Daniel Nishi
9f84622be4 Band aid to fix overly long text in donut.
In the Storage Settings, if the text is too long, it will overlap with
the donut. After discussing with UX, we've opted to shrink the text in
the extenuating circumstances. This is because this text is more of a
helper and the full information is on the left.

Bug: 38030457
Test: Manual with Telugu
Change-Id: I18bcaaae74d049c42eaff50868d3861ae258839d
2017-06-05 13:22:26 -07:00
jackqdyulei
6772f5a2c2 Make footer preferences non-clickable by default
cherry-picked from ag/2301717

Both the footer preference and the TextView they contain
were clickable, which confused some accessibility services.

Bug: 62050563
Test: Verified that switch access no longer offers users
the option of clicking on the footer for accessibility
services and Magnification as well as in the Battery
settings screen.

Change-Id: I5cb13d6268466c690dd38f2b652422d2c3d813b4
Merged-In: I937340fda93f6a8097919e1f86d5d890487370bc
2017-06-05 10:44:34 -07:00
Lorenzo Colitti
2561df8083 When validation state changes, update the AP summary.
This stops the AP summary from getting stuck on "Connected, no
Internet" even when the system has validated Internet access.

Bug: 62209358
Test: make -j64 RunSettingsRoboTests
Change-Id: I235404408f7d8b958653d25656d97da8206e35ce
2017-06-04 23:00:47 +09:00
TreeHugger Robot
7eeca4b052 Merge "wifi: use WifiSavedConfigUtils to retrieve saved configurations" into oc-dev 2017-06-02 20:25:20 +00:00
Lei Yu
74ca6aa060 Merge "Restart loader in onResume" into oc-dev 2017-06-02 19:21: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
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
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
4b29f593f0 Merge "Add group name into channel summary, if applicable." into oc-dev 2017-06-02 15:39:44 +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
Esteban Talavera
92f78354f9 Merge "Include disabled managed profiles in Accounts page" into oc-dev 2017-06-02 08:33:17 +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
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
TreeHugger Robot
fbc9035bcd Merge "Add search bar to SearchActivity." into oc-dev 2017-06-01 22:02:32 +00:00