Commit Graph

35229 Commits

Author SHA1 Message Date
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
TreeHugger Robot
02e360dbc9 Merge "Update the no-results icon in settings search" into oc-dev 2017-06-06 17:25:57 +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
TreeHugger Robot
11465af11e Merge "Import translations. DO NOT MERGE" into oc-dev 2017-06-06 16:17:44 +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
Salvador Martinez
a8e887be86 Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev 2017-06-06 04:29:32 +00:00
Fan Zhang
89dc1d1ee2 Revert "Remove dynamic summary from Security Patch info"
The change breaks build

Fix: 62359766
Bug: 36101902

This reverts commit 2b562f84b6.

Change-Id: Ie712d471f1fa9858b65fd1c0b111405dfb49eb38
2017-06-06 04:13:04 +00: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
Matthew Fritze
6fa75da66d Update the no-results icon in settings search
Bug: 36597112
Test: Open settings, search for 'battle toads', and see the no results icon
Change-Id: I7196114ecaf733747237202d30dd1b47ad37d97e
2017-06-05 17:53:14 -07: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
685041559a Merge "Move strings to SettingsLib so TV can use them" into oc-dev 2017-06-03 21:40:56 +00:00
Bill Yi
016a542876 Import translations. DO NOT MERGE
Change-Id: I2484f37f3299006a02b28681ccd1be87123dba7b
Auto-generated-cl: translation import
2017-06-03 11:42:52 -07:00
Tony Mantler
94c717f239 Move strings to SettingsLib so TV can use them
Bug: 38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
Merged-In: Iea90cbcf858cd598af4adc017e673e299a62ed39
2017-06-02 15:10:18 -07: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
Lei Yu
5f4f1b81af Merge "Refine the ProgressCategory" into oc-dev 2017-06-02 17:08:45 +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
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
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
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
fbc9035bcd Merge "Add search bar to SearchActivity." into oc-dev 2017-06-01 22:02:32 +00:00
TreeHugger Robot
7a148b9e09 Merge "Prevent crash when removing duplicates" into oc-dev 2017-06-01 21:12:11 +00:00
TreeHugger Robot
e12790e34f Merge "Add method to disable "disable" button in installed app UI" into oc-dev 2017-06-01 20:24:06 +00:00
Alison Cichowlas
afe44799f7 Delay adding app settings link until data fetch returns,
to avoid reordering/visible misplaced "additional settings
in the app" during transition.

Bug: 62051521
Test: manual with transition scale turned to 10x sloooow.
Change-Id: I50666fbcb2a14344bbdbb2f4347c8470edb96619
2017-06-01 16:07:32 -04:00
Andrew Sapperstein
91fe76263f Merge "Initial search bar implementation." into oc-dev 2017-06-01 19:52:07 +00:00
TreeHugger Robot
d4991dc24d Merge "Add method to calculate last full charge time" into oc-dev 2017-06-01 18:55:54 +00:00
Matthew Fritze
ebd80e68ab Prevent crash when removing duplicates
The method that crashes is removed in O-DR, and thus
does not need to be merged down.

Change-Id: If30bd8bd92d578133984f7f35e7ec5288adfc390
Fixes: 62100634
Test: make RunSettingsRoboTests
Merged-In: Id36f7bf4ceaaa3a2bd326ecafbfe97fd0b247df2
2017-06-01 11:13:37 -07:00
Andrew Sapperstein
fac61b71e5 Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.

Removes the action bar and replaces it with a SearchView
inside of a CardView.

Remaining work: pixel pushing

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-01 11:02:56 -07:00
Daniel Nishi
7035a41715 Merge "Fix a bug where cache was double-counted." into oc-dev 2017-06-01 17:30:33 +00:00
Alison Cichowlas
9f36db1f4c Disallow buzz/beep/disturb changes for notifications with locked importance.
If mAppRow.lockedImportance (which comes from the whitelist config_nonBlockableNotificationPackages), don't allow sound, vibration, or override dnd to be changed.

Bug: 38480212
Test: manually verified for now
Change-Id: I04aa7f15f2480472ec6ee487472098e81ab3d99f
2017-06-01 10:52:15 -04:00
Esteban Talavera
9b86e9c822 Include disabled managed profiles in Accounts page
At the moment we include disabled profiles when deciding
whether the Work section needs to be added, and then only
include enabled ones when searching for the managed profile's
user handle

Change-Id: I96b0c36aad6b9326abc2992fa3309716f5cd1e74
Fix: 62021410
Test: m RunSettingsRoboTests
2017-06-01 09:52:45 +01:00
TreeHugger Robot
98b67a4e94 Merge "Add onResume to FingerprintEnrollEnrolling" into oc-dev 2017-06-01 08:09:52 +00:00
Lorenzo Colitti
0bde06cd59 Reduce jank in the wifi detail status page.
Currently, when anything changes, the wifi detail status page
removes and then redraws all IP address information. This causes
the whole screen to flicker. Instead, only add and remove things
when they actually change.

In order to do this, convert the IPv6 addresses from a list of
Preference objects to a single newline-separated text field.
This removes the need to keep track of addresses as they are
added and deleted, and also looks a bit better.

Also, minor correctness fixes:
- Get the gateway from the default route, not from the last route
  with a non-null gateway.
- Get the IPv4 subnet mask from the IPv4 address prefix, not from
  the last route with prefix length > 0.

Bug: 62171690
Test: make -j64 RunSettingsRoboTests
Test: IP information does not flicker when signal strength changes
Change-Id: Ia9f2a277e53a2800407ae327701c5b95a9eec20a
2017-06-01 12:08:41 +09:00
Kevin Chyn
bb846a6608 Add onResume to FingerprintEnrollEnrolling
Fixes: 62233947

Test: revoke usb permissions, start enrolling, attach usb,
	press ok, continue enroll. enroll should be able to continue
	and complete

onPause was added in b/38102355, but onResume was not added. We should
set the listener in onResume()

Change-Id: I59e617b4789f028d01b86d38049671888c07a5ec
2017-05-31 17:11:03 -07:00
Christine Franks
9ef166a578 Merge "Allow FR in carrier demo mode" into oc-dev 2017-05-31 22:47:43 +00:00