OSDN Git Service
Tony Mak [Thu, 15 Jun 2017 22:29:04 +0000 (22:29 +0000)]
Fix searching work app in settings NO PARTIAL RERUN
am:
5651e0f2ce
Change-Id: Ib670fbde3997c8c6e984bb627bc305da7f235e2e
Tony Mak [Mon, 12 Jun 2017 17:31:40 +0000 (18:31 +0100)]
Fix searching work app in settings NO PARTIAL RERUN
Test: m -j RunSettingsRoboTests
Test: Observe search result with badged icon and showing work app info
when tapping on it.
Test: personal app search result is still working
Test: Non app search result is working
Fix:
62366873
Merged-in: I333372699b263d02cc4083289dc746c7aacd414d
Change-Id: I9c87345478f8df57b151927d8097cd8fd90fbe79
Sundeep Ghuman [Thu, 15 Jun 2017 06:39:40 +0000 (06:39 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
am:
683a7e2bf5
Change-Id: Id9ef9060ce76f96d36338e5ba4ddd0701b538a08
TreeHugger Robot [Thu, 15 Jun 2017 06:30:57 +0000 (06:30 +0000)]
Merge "Allow WifiSettings to show old APs on app resume." into oc-dev
Sundeep Ghuman [Tue, 13 Jun 2017 01:16:53 +0000 (18:16 -0700)]
Allow WifiSettings to show old APs on app resume.
If we do not have any recent scan results, show the previous APs from
when the app was last paused, by not triggering a force update.
Accompanying changes are also made in WifiTracker to prevent
onAccessPointsChanged callbacks from being invoked until the tracker
receives a new 'SCAN_RESULTS_AVAILABLE' broadcast (ag/
2409026).
Bug: b/
38212080
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
one minute later.
Change-Id: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Merged-In: I4f9b2ec855e057e28235b0253ab42c6b4521bebc
Bill Yi [Tue, 13 Jun 2017 08:11:23 +0000 (08:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
327b9119d7 -s ours
Change-Id: I894b154c6d428d8ff35098dcee354892d89cdca4
TreeHugger Robot [Tue, 13 Jun 2017 08:07:07 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Alison Cichowlas [Tue, 13 Jun 2017 01:41:39 +0000 (01:41 +0000)]
Limit unconfigurability to specified channels.
am:
80fa6b5833
Change-Id: I259952cbd22ef6a98d45cb3e077e07d5eb797b67
Bill Yi [Tue, 13 Jun 2017 01:23:15 +0000 (18:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9e652a0921b8e6c0c084b4deeb2949ce84896319
Auto-generated-cl: translation import
Alison Cichowlas [Thu, 8 Jun 2017 20:17:23 +0000 (16:17 -0400)]
Limit unconfigurability to specified channels.
Bug:
62426259
Test: Unit test in NotificationBackendTest.java
Change-Id: I79d069cee0b641d520b02f8a25751ec3e0d4632d
Antony Sargent [Fri, 9 Jun 2017 15:49:11 +0000 (15:49 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
am:
d77b699e60
Change-Id: I2f7f524ee29224ee02a881c368bc058e55e98fec
Antony Sargent [Fri, 9 Jun 2017 15:41:25 +0000 (15:41 +0000)]
Merge "Set advanced battery usage items as non-selectable" into oc-dev
jackqdyulei [Fri, 9 Jun 2017 08:34:46 +0000 (08:34 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
am:
4f02eebab8
Change-Id: Id02583309a3e547855b7ffc69e065c2293fb172e
TreeHugger Robot [Fri, 9 Jun 2017 08:29:56 +0000 (08:29 +0000)]
Merge "Make flag "showAllapps" persistent in PowerUsageSummary" into oc-dev
jackqdyulei [Thu, 8 Jun 2017 21:26:39 +0000 (14:26 -0700)]
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
jackqdyulei [Fri, 9 Jun 2017 02:57:46 +0000 (02:57 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev
am:
031b90541f
Change-Id: I7ec1ee37eb42d5523502ae3a17694f61ea6197ba
TreeHugger Robot [Fri, 9 Jun 2017 02:53:35 +0000 (02:53 +0000)]
Merge "Update subtitle for apps in battery settings" into oc-dev
Matthew Fritze [Fri, 9 Jun 2017 01:23:39 +0000 (01:23 +0000)]
Merge "Search results always highlight proper results" into oc-dev
am:
2a32cb6a33
Change-Id: I649a4122952a41b31ee66b0daab8607b683d3e19
TreeHugger Robot [Fri, 9 Jun 2017 01:19:37 +0000 (01:19 +0000)]
Merge "Search results always highlight proper results" into oc-dev
Daniel Nishi [Fri, 9 Jun 2017 00:19:03 +0000 (00:19 +0000)]
Merge "Update the music files icon." into oc-dev
am:
47c6afde7f
Change-Id: I78e6e1a16e25aff0e0374f5910fcbba0624f712b
TreeHugger Robot [Fri, 9 Jun 2017 00:13:18 +0000 (00:13 +0000)]
Merge "Update the music files icon." into oc-dev
Matthew Fritze [Wed, 7 Jun 2017 00:14:33 +0000 (17:14 -0700)]
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
Bill Yi [Thu, 8 Jun 2017 22:48:47 +0000 (22:48 +0000)]
Import translations. DO NOT MERGE
am:
29a7bce4e5 -s ours
Change-Id: Iaec93787ba7a7e2eb885893842cea02932e16abe
jackqdyulei [Wed, 7 Jun 2017 22:56:03 +0000 (15:56 -0700)]
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
Daniel Nishi [Mon, 5 Jun 2017 21:35:29 +0000 (14:35 -0700)]
Update the music files icon.
Change-Id: Id1c933e395131ca6e9e9268d7c42f7324aa6fdac
Fixes:
62291640
Test: Manual
Bill Yi [Thu, 8 Jun 2017 14:59:38 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I118bf54c3426f15db267545b83e9478177d13a06
Auto-generated-cl: translation import
Bartosz Fabianowski [Thu, 8 Jun 2017 05:55:40 +0000 (05:55 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
am:
9e94d80fa5
Change-Id: Ic9c510dac141664020567877d501da6289b633b4
TreeHugger Robot [Thu, 8 Jun 2017 05:51:14 +0000 (05:51 +0000)]
Merge "Add keys to all Preferences on the Managed device info page" into oc-dev
jackqdyulei [Thu, 8 Jun 2017 02:13:24 +0000 (02:13 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev
am:
f5f51c4cf2
Change-Id: Ifd36cd50e2f4528dae247e99aafb5e93d916351e
TreeHugger Robot [Thu, 8 Jun 2017 02:10:28 +0000 (02:10 +0000)]
Merge "Use default package in BatteryEntry" into oc-dev
Matthew Fritze [Wed, 7 Jun 2017 20:46:56 +0000 (20:46 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev
am:
9f2f9e331f
Change-Id: Ie3fe1e8a7d2ac0c4045209403966dd80b7c4b5fa
TreeHugger Robot [Wed, 7 Jun 2017 20:39:36 +0000 (20:39 +0000)]
Merge "Hide Display Theme from search results when not available" into oc-dev
jackqdyulei [Wed, 7 Jun 2017 20:20:47 +0000 (13:20 -0700)]
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
Matthew Fritze [Wed, 7 Jun 2017 15:59:30 +0000 (08:59 -0700)]
Hide Display Theme from search results when not available
Test: make RunSettingsRoboTests
Fixes:
62377986
Change-Id: I5d0737034ef3f845e790934465b65a5415654822
Bartosz Fabianowski [Tue, 6 Jun 2017 15:33:30 +0000 (17:33 +0200)]
Add keys to all Preferences on the Managed device info page
In order to be able to hide the page from search results, all Preferences
(and PreferenceCategories) must have android:keys.
Bug:
62285529
Test: The Settings framework will have a test that ensure each Preference
Test: has a key from O-DR onward
Change-Id: I1e41ce6f8b9f90155ef92354b9268e9e720e1e73
Antony Sargent [Tue, 6 Jun 2017 23:04:56 +0000 (16:04 -0700)]
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
William Luh [Tue, 6 Jun 2017 23:57:31 +0000 (23:57 +0000)]
Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev
am:
f702e39156
Change-Id: I3e45e09f609428bd7abe46629d68adf54c5b357b
Alison Cichowlas [Tue, 6 Jun 2017 23:57:05 +0000 (23:57 +0000)]
Merge "If two groups are posted to settings, remove old group and log." into oc-dev
am:
9fa5e66a66
Change-Id: Iafb44eeb33fc626633ed885a2a18ed1cbe95ee48
William Luh [Tue, 6 Jun 2017 23:56:36 +0000 (23:56 +0000)]
Merge "Make icons colorful for Security settings." into oc-dev
am:
9f7e705426
Change-Id: I397599ce60a3a334aae17ad77dfa94c4e7b24398
TreeHugger Robot [Tue, 6 Jun 2017 23:52:47 +0000 (23:52 +0000)]
Merge "Use the standard place holder for the security summary. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 23:34:42 +0000 (23:34 +0000)]
Merge "If two groups are posted to settings, remove old group and log." into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 23:31:07 +0000 (23:31 +0000)]
Merge "Make icons colorful for Security settings." into oc-dev
Lorenzo Colitti [Tue, 6 Jun 2017 22:35:42 +0000 (22:35 +0000)]
Merge "Wifi details: minor ordering fixes." into oc-dev
am:
85395155fb
Change-Id: Iae57ad27902d3dcb5406007ddc21bb03545bfcea
Lorenzo Colitti [Tue, 6 Jun 2017 22:24:42 +0000 (22:24 +0000)]
Merge "Wifi details: minor ordering fixes." into oc-dev
William Luh [Tue, 6 Jun 2017 17:27:26 +0000 (10:27 -0700)]
Make icons colorful for Security settings.
Bug:
37997112
Test: make RunSettingsRoboTests
Change-Id: I287b5321cab0d4432fae61cf5565251180f37f5f
Alison Cichowlas [Tue, 6 Jun 2017 19:06:14 +0000 (15:06 -0400)]
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
Hiroki Yamamoto [Tue, 6 Jun 2017 19:34:49 +0000 (19:34 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am:
e990bf3041 am:
56a8267f59
am:
77452b8a57
Change-Id: I19237cb1f24dc1f0b127b2bd2476ee1f3a28b0bb
Hiroki Yamamoto [Tue, 6 Jun 2017 19:28:41 +0000 (19:28 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set" am:
e990bf3041
am:
56a8267f59
Change-Id: Idca7ade0068f390289c7c13d1765fead6e0e1d35
Hiroki Yamamoto [Tue, 6 Jun 2017 19:22:09 +0000 (19:22 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set"
am:
e990bf3041
Change-Id: I2b2978a82a9dbee948b4e50f2b85978b9ddb58e5
Treehugger Robot [Tue, 6 Jun 2017 19:12:53 +0000 (19:12 +0000)]
Merge "NFC: Reset Tap&pay summary text if default payment is not set"
Andrew Sapperstein [Tue, 6 Jun 2017 19:10:43 +0000 (19:10 +0000)]
Merge "Revert "Initial search bar implementation."" into oc-dev
am:
dfc1983601
Change-Id: I6c143b18b53857accac23d7c64f807c6987609a5
TreeHugger Robot [Tue, 6 Jun 2017 19:04:25 +0000 (19:04 +0000)]
Merge "Revert "Initial search bar implementation."" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 19:00:29 +0000 (19:00 +0000)]
Merge "Check for dynamic summaries at display time for search" into oc-dev
am:
2046c59b77
Change-Id: I549f1aa455ffbff0119dd00ef782710992100cce
Andrew Sapperstein [Tue, 6 Jun 2017 19:00:04 +0000 (19:00 +0000)]
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
am:
37f87b6c64
Change-Id: Icbdb586e3e1a35c004298f50a57812e50ee73eea
TreeHugger Robot [Tue, 6 Jun 2017 18:52:30 +0000 (18:52 +0000)]
Merge "Check for dynamic summaries at display time for search" into oc-dev
TreeHugger Robot [Tue, 6 Jun 2017 18:42:24 +0000 (18:42 +0000)]
Merge "Revert "Add search bar to SearchActivity."" into oc-dev
William Luh [Fri, 26 May 2017 23:10:51 +0000 (16:10 -0700)]
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
Matthew Fritze [Tue, 6 Jun 2017 17:58:30 +0000 (17:58 +0000)]
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
am:
b8028f63ec
Change-Id: I47066c45b6ee286a2f1eac5ba1d57a5de058652c
TreeHugger Robot [Tue, 6 Jun 2017 17:44:21 +0000 (17:44 +0000)]
Merge "Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""" into oc-dev
Daniel Nishi [Tue, 6 Jun 2017 17:40:04 +0000 (17:40 +0000)]
Merge "Band aid to fix overly long text in donut." into oc-dev
am:
b5abb2c1d2
Change-Id: I8bd8b052cd8c437dd858a459c8098e39878b4b50
Matthew Fritze [Tue, 6 Jun 2017 17:34:31 +0000 (17:34 +0000)]
Merge "Update the no-results icon in settings search" into oc-dev
am:
02e360dbc9
Change-Id: Ic77a5d965bfb882d128182f3eaff5e0c857dd500
Daniel Nishi [Tue, 6 Jun 2017 17:33:55 +0000 (17:33 +0000)]
Merge "Band aid to fix overly long text in donut." into oc-dev
Andrew Sapperstein [Tue, 6 Jun 2017 16:33:27 +0000 (16:33 +0000)]
Revert "Initial search bar implementation."
This reverts commit
14934599dd6008a79c5e0d67f1df9ba5886c5198.
Bug:
37477506
Change-Id: I510b9a71dd3f19a3d2194da1f4d8f8060d0a4935
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Andrew Sapperstein [Tue, 6 Jun 2017 16:33:13 +0000 (16:33 +0000)]
Revert "Add search bar to SearchActivity."
This reverts commit
fac61b71e5b32bf8cd464049c2750a18911b75b2.
Bug:
37477506
Change-Id: I1ee66999fbb28b03feb5a51c7146f31a71c1252a
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
TreeHugger Robot [Tue, 6 Jun 2017 17:25:56 +0000 (17:25 +0000)]
Merge "Update the no-results icon in settings search" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 01:02:19 +0000 (01:02 +0000)]
Revert "Revert "Revert "Replace dynamic summary text for SettingPref"""
This reverts commit
c1e9f8787f02df0d38a9d4e93f7996318fc46355.
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
Bill Yi [Tue, 6 Jun 2017 16:28:22 +0000 (16:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
11465af11e -s ours
Change-Id: I398b4773e26cb34a1ce6304d91b52df32a11e821
TreeHugger Robot [Tue, 6 Jun 2017 16:17:42 +0000 (16:17 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 02:08:14 +0000 (19:08 -0700)]
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
Hiroki Yamamoto [Tue, 6 Jun 2017 11:05:00 +0000 (20:05 +0900)]
NFC: Reset Tap&pay summary text if default payment is not set
Reset Tap&pay summary text even default payment is null
to show the correct status that is no payment service.
Test: manual
Bug:
62366917
Change-Id: Ida9cf0b205e56163505862498b1ac4d679c2c92a
Salvador Martinez [Tue, 6 Jun 2017 04:35:19 +0000 (04:35 +0000)]
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
am:
a8e887be86
Change-Id: I561cd90ba74a551a44d43a04a1b567efc74e4863
Salvador Martinez [Tue, 6 Jun 2017 04:29:31 +0000 (04:29 +0000)]
Merge "Revert "Remove dynamic summary from Security Patch info"" into oc-dev
Fan Zhang [Tue, 6 Jun 2017 04:07:52 +0000 (04:07 +0000)]
Revert "Remove dynamic summary from Security Patch info"
The change breaks build
Fix:
62359766
Bug:
36101902
This reverts commit
2b562f84b6c317711fdb70db5b4d3cb9953ed536.
Change-Id: Ie712d471f1fa9858b65fd1c0b111405dfb49eb38
Lorenzo Colitti [Sun, 4 Jun 2017 14:15:40 +0000 (23:15 +0900)]
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
jackqdyulei [Tue, 6 Jun 2017 02:05:09 +0000 (02:05 +0000)]
Merge "Make footer preferences non-clickable by default" into oc-dev
am:
8fbb0bc1f2
Change-Id: Idd493f97773816dc4cc1c759bc5465a2b7f4b04f
TreeHugger Robot [Tue, 6 Jun 2017 01:53:58 +0000 (01:53 +0000)]
Merge "Make footer preferences non-clickable by default" into oc-dev
Lorenzo Colitti [Tue, 6 Jun 2017 01:27:32 +0000 (01:27 +0000)]
Merge changes I23540440,I67269e1a into oc-dev
am:
4249a7092b
Change-Id: Ic8383cce733c5767b133af0e9f85e213e0c36018
Lorenzo Colitti [Tue, 6 Jun 2017 01:22:07 +0000 (01:22 +0000)]
Merge changes I23540440,I67269e1a into oc-dev
* changes:
When validation state changes, update the AP summary.
Minor tweaks to WifiDetailPreferenceControllerTest.
Doris Ling [Tue, 6 Jun 2017 01:15:51 +0000 (01:15 +0000)]
Merge "Also update flip camera settings for managed profile." into oc-dev
am:
051a83d909
Change-Id: I4ba1750948815233ef6a963ddde1ca0bd33bcdec
Doris Ling [Tue, 6 Jun 2017 01:15:10 +0000 (01:15 +0000)]
Remove call to WifiManager.setWifiApEnabled().
am:
f38ed2fbb2
Change-Id: I255679d0eaeaa94d2ac6e5caddf4c6f5a5581bc1
TreeHugger Robot [Tue, 6 Jun 2017 01:12:28 +0000 (01:12 +0000)]
Merge "Also update flip camera settings for managed profile." into oc-dev
Matthew Fritze [Tue, 6 Jun 2017 00:53:14 +0000 (17:53 -0700)]
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
Doris Ling [Mon, 5 Jun 2017 21:48:44 +0000 (14:48 -0700)]
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
Doris Ling [Fri, 2 Jun 2017 00:06:40 +0000 (17:06 -0700)]
Remove call to WifiManager.setWifiApEnabled().
- replace it with ConnectivityManager.stopTethering() instead.
Change-Id: I112863b1be37c0fef5d59c16d73f0c6cf71c6dea
Fix:
62191978
Test: make RunSettingsRoboTests
Daniel Nishi [Wed, 24 May 2017 23:25:08 +0000 (16:25 -0700)]
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
jackqdyulei [Mon, 5 Jun 2017 17:44:34 +0000 (10:44 -0700)]
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
Lorenzo Colitti [Fri, 2 Jun 2017 09:00:40 +0000 (18:00 +0900)]
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
Thecrazyskull [Sun, 4 Jun 2017 00:04:25 +0000 (00:04 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition" am:
46f7199cb1 am:
6270dce2cd
am:
7151be926d
Change-Id: I16805427f0d053c6d1c5975275f00cb0ed1c9cbb
Thecrazyskull [Sun, 4 Jun 2017 00:00:25 +0000 (00:00 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition" am:
46f7199cb1
am:
6270dce2cd
Change-Id: Ie8ce734935d9950c515675710772aa5f3c80c988
Thecrazyskull [Sat, 3 Jun 2017 23:55:52 +0000 (23:55 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition"
am:
46f7199cb1
Change-Id: Ifd9394c6da48a88ddb6f59ead3db1c93519a70ac
Treehugger Robot [Sat, 3 Jun 2017 23:49:37 +0000 (23:49 +0000)]
Merge "ConditionManager: don't crash when trying to add unexpected condition"
Mikhail Malakhov [Sat, 3 Jun 2017 22:24:50 +0000 (22:24 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am:
c7697e9b8a am:
933cdd5503
am:
0730393097
Change-Id: Ia65d7c966350dac44a1d15a5781d051df8d464cd
Mikhail Malakhov [Sat, 3 Jun 2017 22:20:48 +0000 (22:20 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing" am:
c7697e9b8a
am:
933cdd5503
Change-Id: I0fbdadf1b42543936f3ed657b52da23978a0fe16
Mikhail Malakhov [Sat, 3 Jun 2017 22:16:48 +0000 (22:16 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
am:
c7697e9b8a
Change-Id: Ic9bdabec50ba8b72656c0d5fc0b56551ad3a46cb
Treehugger Robot [Sat, 3 Jun 2017 22:11:11 +0000 (22:11 +0000)]
Merge "Sometime, Settings app crash when AllowBindAppWidgetActivity closing"
Tony Mantler [Sat, 3 Jun 2017 22:00:17 +0000 (22:00 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
am:
685041559a
Change-Id: I9ff3757e28b82caac7d83394f3734eee040a7b00
TreeHugger Robot [Sat, 3 Jun 2017 21:40:51 +0000 (21:40 +0000)]
Merge "Move strings to SettingsLib so TV can use them" into oc-dev
Bill Yi [Sat, 3 Jun 2017 18:42:52 +0000 (11:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2484f37f3299006a02b28681ccd1be87123dba7b
Auto-generated-cl: translation import
Thecrazyskull [Thu, 2 Mar 2017 19:55:59 +0000 (14:55 -0500)]
ConditionManager: don't crash when trying to add unexpected condition
* Instead, just don't add the unexpected condition
Test: none
Change-Id: Id768d54e90fac6cbbfdca514e769cb3b331fbc46
Tony Mantler [Fri, 26 May 2017 20:34:14 +0000 (13:34 -0700)]
Move strings to SettingsLib so TV can use them
Bug:
38496265
Test: Compiles
Change-Id: Iea90cbcf858cd598af4adc017e673e299a62ed39
Merged-In: Iea90cbcf858cd598af4adc017e673e299a62ed39