Commit Graph

15918 Commits

Author SHA1 Message Date
Jack He
fa183f7a49 Fix a crash when an app requests Bluetooth to be discoverable am: ebbfce0bf1
am: 4b27231fd4

Change-Id: Id383dca443a09dd25b520978b9fbe8f5791eb46f
2017-04-04 04:17:31 +00:00
Jack He
4b27231fd4 Fix a crash when an app requests Bluetooth to be discoverable
am: ebbfce0bf1

Change-Id: I3fcdf1abcf7ce42b7f95dc9ca34aad6dac03daff
2017-04-04 04:12:08 +00:00
Jack He
ebbfce0bf1 Fix a crash when an app requests Bluetooth to be discoverable
* When an app requests Bluetooth to be discoverable with a timeout and a
  non null EXTRA_PACKAGE_NAME, Settings app should put in the correct
  timeout values in the dialog string

Bug: 36870303
Test: make, try making Bluetooth discoverable via
      ACTION_REQUEST_DISCOVERABLE intent

Change-Id: I0cebc2f20371c9de5f28feb26425422c0777aa45
2017-04-04 01:53:20 +00:00
Jeff Sharkey
5a13d2fc4d Merge "Don't try using a detached fragment." into oc-dev am: b59337c0eb
am: 019946868e

Change-Id: I5e60e805cda5e7210d18027dfd4ddf9382ce50b8
2017-04-04 01:31:09 +00:00
Jeff Sharkey
019946868e Merge "Don't try using a detached fragment." into oc-dev
am: b59337c0eb

Change-Id: I7b52324981b9f6bd71a1497b0d93afbd4dcb7ef9
2017-04-04 01:26:59 +00:00
Jeff Sharkey
5e2fc68668 Don't try using a detached fragment.
Test: builds, boots
Bug: 36486843
Change-Id: I3e2d2bcd56edcc86370f4b64dabdf155d63f40d3
2017-04-03 17:19:19 -06:00
TreeHugger Robot
b4e7b17223 Merge "Add AvailableVirtualKeyboardFragment to TV" 2017-04-03 22:04:18 +00:00
Maurice Lam
ca022e2b9b Merge "Fix suggested action custom view binding" 2017-04-03 21:38:20 +00:00
Maurice Lam
68d6bcd18a Merge "Rebuild suggestions when suggestions are dismissed" 2017-04-03 21:37:59 +00:00
Hemant Gupta
06dc823fb7 Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85 am: 2ffab51c0e am: b5e14d5f30
am: ec6815ea7c

Change-Id: I7a49313949a334776b69d12f09c807251005aacd
2017-04-03 18:40:19 +00:00
Hemant Gupta
ec6815ea7c Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85 am: 2ffab51c0e
am: b5e14d5f30

Change-Id: Ie2246c812f6a34086c19561f62e73f714bdd8eff
2017-04-03 17:57:42 +00:00
Hemant Gupta
b5e14d5f30 Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" am: e270a6aa85
am: 2ffab51c0e

Change-Id: I96e6196c6e1417c3115946d483d6f822367aca11
2017-04-03 17:54:06 +00:00
Hemant Gupta
2ffab51c0e Merge "Bluetooth: Fix Resource Leak in OPP (1/2)"
am: e270a6aa85

Change-Id: Ia5108737add480f2cce52663f13d496653c37320
2017-04-03 17:50:36 +00:00
Treehugger Robot
e270a6aa85 Merge "Bluetooth: Fix Resource Leak in OPP (1/2)" 2017-04-03 17:43:42 +00:00
Amin Shaikh
fa04ad4e8f Fix NPE when forgetting networks. am: 3c0d5ff3d1
am: f73b263583

Change-Id: Ieb5ee707cb977c1bfe8803fb4678c5b8fda0337c
2017-04-02 21:36:50 +00:00
Amin Shaikh
f73b263583 Fix NPE when forgetting networks.
am: 3c0d5ff3d1

Change-Id: I713d50e7ecf31b95990afba7c26e2c0d54177f10
2017-04-02 21:33:55 +00:00
Amin Shaikh
3c0d5ff3d1 Fix NPE when forgetting networks.
- Fixed disablement of ephemeral networks
- Exit out of the fragment when Forget is pressed

Bug: 36723238
Test: m RunSettingsRoboTests and manual testing
Change-Id: I83c09a44dbef0f02a452dc8c3163523a27bd4b63
2017-04-02 12:19:42 -07:00
TreeHugger Robot
5ed1fc855e Merge "Adds the Clear App dialog for Instant Apps" 2017-04-02 18:25:26 +00:00
Jesse Evans
6ecbdadd6a Merge "Removes summary text from Instant Apps details" into oc-dev
am: 8fc0d1f948

Change-Id: I806826bd2b7ee5435f132d9f3db234878b9b429f
2017-04-02 16:17:35 +00:00
Jesse Evans
8fc0d1f948 Merge "Removes summary text from Instant Apps details" into oc-dev 2017-04-02 16:13:54 +00:00
Jesse Evans
91c51146a4 Merge "Removes instant apps from certain screens" 2017-04-02 16:09:32 +00:00
Lei Yu
b643a0d30b Merge "Fix crash when opening battery page" 2017-04-02 07:03:48 +00:00
Lei Yu
851e73b8a2 Merge "Ui changes in battery main page" 2017-04-02 07:03:10 +00:00
Charles He
2a3513673f VPN settings: add missing string resource am: 1b5015cae6
am: eea0037272

Change-Id: I098bd31a201e89d17f849262ac1c0cc81b43218f
2017-04-01 20:50:57 +00:00
Charles He
eea0037272 VPN settings: add missing string resource
am: 1b5015cae6

Change-Id: I02c4ebe3d03cf4cd10c7d7803532433d519ff4e2
2017-04-01 20:47:57 +00:00
Charles He
1b5015cae6 VPN settings: add missing string resource
Previously, a string resource was deleted by mistake in commit
cce4e61260. This bug went uncaught by
local and presubmit build checks. We add the missing string back to
strings.xml to fix the build. The affected string is referenced in
ManageablePreference.java.

Apologies for any inconvenience.

Test: make SettingsRoboTests; manually navigate through VPN settings
Bug: 36815998
Change-Id: Ibc2ef9ad43cad73ef5f078714faf5c52bc7198c6
2017-04-01 18:37:10 +00:00
Bartosz Fabianowski
9f7308baad Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev
am: 5569816021

Change-Id: I5b8286dce56e89ae924166d142785d52af4eb6bd
2017-04-01 05:20:07 +00:00
Bartosz Fabianowski
1e67d8902c Merge "Device management info: Refer to current user, not primary user" into oc-dev
am: 57a0771bf5

Change-Id: I65756248e8803b140277bb84a17e3c965ced0f11
2017-04-01 05:18:30 +00:00
TreeHugger Robot
5569816021 Merge "Keep EnterprisePrivacySettingsActivity always enabled" into oc-dev 2017-04-01 05:17:10 +00:00
TreeHugger Robot
57a0771bf5 Merge "Device management info: Refer to current user, not primary user" into oc-dev 2017-04-01 05:12:39 +00:00
Jesse Evans
aabcca5187 Merge "Adds the lightning badge for Instant Apps" into oc-dev
am: ef64404f44

Change-Id: Iaae54c4ccf9656b14e7bbaa24a8979eadfbc2e5d
2017-04-01 05:05:55 +00:00
Suprabh Shukla
cb044f7045 Merge "Disabling switch preference when unknown sources are blocked" into oc-dev
am: 8e7b655dc0

Change-Id: I8533c4328476bfe4501f277cd697526033b3dd0a
2017-04-01 05:04:33 +00:00
TreeHugger Robot
ef64404f44 Merge "Adds the lightning badge for Instant Apps" into oc-dev 2017-04-01 04:59:53 +00:00
TreeHugger Robot
8e7b655dc0 Merge "Disabling switch preference when unknown sources are blocked" into oc-dev 2017-04-01 04:59:33 +00:00
Suprabh Shukla
6221a5b8d2 Disabling switch preference when unknown sources are blocked
When the user restriction DISALLOW_INSTALL_UNKNOWN_SOURCES is set,
changing the preferences in settings is meaningless as package installer
will not let the install proceed. Disabling the settings switch and
updated the summaries to reflect when a switch is disabled. Removing
robolectric test as the logic is no longer testable due to missing stubs
for UserManager and UserHandle.

Test: CtsVerifier -> Device Owner Tests -> Policy Transparency Test

Bug: 34688413
Change-Id: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
Merged-In: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
2017-04-01 02:58:00 +00:00
Suprabh Shukla
d9a3f31019 Merge "Disabling switch preference when unknown sources are blocked" 2017-04-01 02:40:22 +00:00
Stephen Chen
bb0de14f97 Improve responsiveness of toggling wifi and refactor user restriction logic. am: 19b74d9213
am: 40adeaf28a

Change-Id: I5cbd3b05d16a64ffd488db739d87b2043347ccca
2017-04-01 01:30:51 +00:00
Stephen Chen
40adeaf28a Improve responsiveness of toggling wifi and refactor user restriction logic.
am: 19b74d9213

Change-Id: I0d776b5e4325782b9c6ad05beae51ca7e902fd22
2017-04-01 01:28:51 +00:00
Maurice Lam
cbf797e65c Rebuild suggestions when suggestions are dismissed
When suggestions are swiped away, refresh the suggestion categories
so that suggestions previously suppressed because it's lower priority
or because there is an exclusive suggestion now has a chance to be
shown.

Test: cd tests/robotests && mma
Bug: 36811621
Change-Id: I1a1ae1624c2f69153d95d238b2143ac9273e117d
2017-03-31 17:13:39 -07:00
Suprabh Shukla
cb9164ad48 Disabling switch preference when unknown sources are blocked
When the user restriction DISALLOW_INSTALL_UNKNOWN_SOURCES is set,
changing the preferences in settings is meaningless as package installer
will not let the install proceed. Disabling the settings switch and
updated the summaries to reflect when a switch is disabled. Removing
robolectric test as the logic is no longer testable due to missing stubs
for UserManager and UserHandle.

Test: CtsVerifier -> Device Owner Tests -> Policy Transparency Test

Bug: 34688413
Change-Id: I7cf6cc09a5d29721186a0df9405d3c7e486295ee
2017-03-31 16:16:20 -07:00
Stephen Chen
19b74d9213 Improve responsiveness of toggling wifi and refactor user restriction logic.
Moved logic for handling wifi state changes into correct listener
method. Changed logic for handling isUiRestricted. This should
streamline toggling flow for WiFi both when Wifi Scanning is on and off,
and in guest mode.

Bug: 36724409
Bug: 36711085
Bug: 36398321

Test: make, test cases in tracking bug
Change-Id: I69fe07369db192c94f81dd678087ac4e8c35197b
2017-03-31 15:47:43 -07:00
jackqdyulei
fac713318c Fix crash when opening battery page
The settings crashes when opening battery usage detail page from
installed app page. Main reason is that it trying to open obsolete
page. This cl directs it to open AdvancedPowerUsageDetail instead.

Following cl will make InstalledAppDetail show calibrated percentage,
which is trakced in b/36816681

Bug: 36792973
Test: RunSettingsRoboTests
Change-Id: Ie63e64e543ed3b28974ffdda8b42c97e7749a0f7
2017-03-31 14:50:40 -07:00
Tony Mantler
2ec69563cd Add AvailableVirtualKeyboardFragment to TV
Allows enabling/disabling IMEs on TV.
Moves InputMethodPreference to SettingsLib.
Also minor code tidying

Bug: 36079941
Test: Keyboard settings still work on Fugu and Ryu
Change-Id: Idf42cf5c46d5bb32db59924819d64f73d533d105
2017-03-31 14:19:29 -07:00
Peter Qiu
2dd96f613f Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev am: 82e2239c54
am: 1599dde849

Change-Id: I242b555fabaed85a72e4f1d38b177cd90071c371
2017-03-31 18:04:17 +00:00
Peter Qiu
1599dde849 Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev
am: 82e2239c54

Change-Id: I5746669f3e2f2157548979d9317bbe6a225bb715
2017-03-31 17:58:58 +00:00
TreeHugger Robot
82e2239c54 Merge "wifi: managed Passpoint configurations in "Saved Networks" page" into oc-dev 2017-03-31 17:54:18 +00:00
jackqdyulei
edfd09d590 Ui changes in battery main page
1. Refine the battery header view
2. Move stats section to the place above power management
3. Add last full charge battery stat
4. Add the disclaimer as a footer

Also update the method name in test file, and this ui changes
also fix the header flash problem.

Bug: 36576021
Bug: 36494178
Test: RunSettingsRoboTests
Change-Id: I9784dbbbe16e61da7287f300183347dd4eee6a2b
2017-03-31 10:16:14 -07:00
Bartosz Fabianowski
1fca17ce2e Device management info: Refer to current user, not primary user
The device management info page should show information about the
current user's policies, not the primary user's.

Bug: 32692748
Test: m RunSettingsRoboTests

Change-Id: I5d8afa7fae1c0f3a4da78b085365882827e6721b
(cherry picked from commit b836da263d)
2017-03-31 09:26:12 +00:00
TreeHugger Robot
901c8e8e6e Merge "Device management info: Refer to current user, not primary user" 2017-03-31 09:25:25 +00:00
Maurice Lam
58c14f7596 Fix suggested action custom view binding
Remove all the views before adding the remote views again, so the
card will not have multiple custom views on top of each other.

Test: cd tests/robotests && mma
Change-Id: Id41bfb962c08e8d1ee6534e0cf44d173a1f1910f
2017-03-30 21:52:01 -07:00