Commit Graph

11546 Commits

Author SHA1 Message Date
Amin Shaikh
ff3d3b45d3 Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev am: 0c4747401a
am: 0a361238d7

Change-Id: I00a3da90f3d5693ea76e1c10d89b1ad792f77b95
2017-04-06 03:09:06 +00:00
Amin Shaikh
0a361238d7 Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev
am: 0c4747401a

Change-Id: Ia60bf563b0719b1abf8c336addba620ec17abe32
2017-04-06 02:03:30 +00:00
TreeHugger Robot
0c4747401a Merge "Link to "scanning settings" when Wi-Fi is off." into oc-dev 2017-04-06 01:41:43 +00:00
Doris Ling
e149201d89 Merge "Add resource string for Security dashboard summary." into oc-dev am: 8c215807b2
am: 3e62570b05

Change-Id: Ibd3b335828773d14d2f0e8e9f188fc7cc7e079d3
2017-04-06 01:37:26 +00:00
Doris Ling
3e62570b05 Merge "Add resource string for Security dashboard summary." into oc-dev
am: 8c215807b2

Change-Id: Ie17257d1acae0e391a3f12edefb5dd582687ff15
2017-04-06 01:30:49 +00:00
TreeHugger Robot
8c215807b2 Merge "Add resource string for Security dashboard summary." into oc-dev 2017-04-06 01:25:06 +00:00
jackqdyulei
99090544b5 Merge "Fix crash when opening battery page" into oc-dev
am: 418e5bffda

Change-Id: I2ea79ff502abaa99c51e1f5e2d4d359d9845a304
2017-04-05 22:55:48 +00:00
TreeHugger Robot
418e5bffda Merge "Fix crash when opening battery page" into oc-dev 2017-04-05 22:45:46 +00:00
jackqdyulei
a242548be7 Merge "Ui changes in battery main page" into oc-dev
am: f297e843e9

Change-Id: I3b96043a327498f0ed935a80a24d6fffbd36c913
2017-04-05 22:25:48 +00:00
TreeHugger Robot
f297e843e9 Merge "Ui changes in battery main page" into oc-dev 2017-04-05 22:13:01 +00:00
jackqdyulei
cdbc114376 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
(cherry picked from commit fac713318c)
2017-04-05 14:12:26 -07:00
Doris Ling
dcb6023bd6 Add resource string for Security dashboard summary.
Add the summary text to be shown when fingerprint sensor is not
available.

Bug: 36889582
Test: builds
Change-Id: I868ced81ad3b3177c8ca366adba937342b67ce65
2017-04-05 12:57:58 -07:00
Amin Shaikh
0820ee350f Link to "scanning settings" when Wi-Fi is off.
Always link to scanning settings when wifi is off. Previously, the link
was only shown when wifi was off and scanning settings were on.

Bug: 36033488
Test: m RunSettingsRoboTests and manually testing on device
Change-Id: I0abc6f4a25072c78fea6a971621cebc1a97b658b
2017-04-04 17:58:59 -07:00
Tony Mantler
c7956d80e6 Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev
am: 30ce1bee20

Change-Id: I0ce18920155bf9f51ae49382d40731e5020c0906
2017-04-04 20:38:23 +00:00
TreeHugger Robot
30ce1bee20 Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev 2017-04-04 20:31:48 +00:00
Maurice Lam
90cb8a1224 Merge "Sticky footer for GLIF theme" 2017-04-04 18:42:30 +00:00
Jesse Evans
5ae795e83a Merge "Adds the Clear App dialog for Instant Apps" into oc-dev
am: c8e06b3fb6

Change-Id: I8396ba9d20e25b40044850a532681adbde3e0354
2017-04-04 17:59:54 +00:00
TreeHugger Robot
c8e06b3fb6 Merge "Adds the Clear App dialog for Instant Apps" into oc-dev 2017-04-04 17:50:00 +00:00
Christine Franks
6d539dc7a4 Merge "Changed description for system alert window setting" into oc-dev am: 48c2d516de
am: c259cee35f

Change-Id: I38cf663bd966013dacf0d7255bab0e4b434beffc
2017-04-04 17:38:29 +00:00
Christine Franks
c259cee35f Merge "Changed description for system alert window setting" into oc-dev
am: 48c2d516de

Change-Id: If350524f65a14de2f7c95919f85657a5e2476469
2017-04-04 17:30:39 +00:00
jackqdyulei
273ad50a3a 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
(cherry picked from commit edfd09d590)
2017-04-04 10:06:35 -07:00
Tony Mantler
d9db7dfc28 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
(cherry picked from commit 2ec69563cd)
2017-04-04 15:49:47 +00:00
Jesse Evans
5c9f7a88b4 Adds the Clear App dialog for Instant Apps
Adds a confirmation dialog for the user when tapping clear app.

From this dialog the user can either cancel, or confirm they
want to clear the app.

Test: make RunSettingsRoboTests

Bug: 36536695
Change-Id: Idffcf5ef318578ae2e075ea2cbb35323d41acade
2017-04-04 08:30:38 -07:00
Christine Franks
3bec2c3c25 Changed description for system alert window setting
Bug: 36070413
Test: make -j100, updated string appears in Settings
Change-Id: I962b17344ea5fc948c35e4d779ed5686df0d09a3
2017-04-04 15:05:16 +00:00
TreeHugger Robot
b4e7b17223 Merge "Add AvailableVirtualKeyboardFragment to TV" 2017-04-03 22:04:18 +00:00
Stephen Chen
fb3bdd7ed4 Merge "Add friction icon for metered networks." into oc-dev am: 9b271041a9
am: c1288e2630

Change-Id: If0a2c01310b5d899fcda40f88d6c22c6db445c00
2017-04-03 18:51:58 +00:00
Stephen Chen
c1288e2630 Merge "Add friction icon for metered networks." into oc-dev
am: 9b271041a9

Change-Id: Ic78a948751317a5536a8ee52825c74672b9a7996
2017-04-03 18:40:34 +00:00
TreeHugger Robot
9b271041a9 Merge "Add friction icon for metered networks." into oc-dev 2017-04-03 18:24:02 +00:00
TreeHugger Robot
5ed1fc855e Merge "Adds the Clear App dialog for Instant Apps" 2017-04-02 18:25:26 +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
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
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
Doris Ling
3b9458d341 Merge "Update text for USB mode selection dialog." into oc-dev am: 23accd2179
am: 8a6d2ed429

Change-Id: I3c1dcb2d8fc2402f87726b3e9c9a836f823a4241
2017-04-01 02:10:22 +00:00
Doris Ling
8a6d2ed429 Merge "Update text for USB mode selection dialog." into oc-dev
am: 23accd2179

Change-Id: Ia48fba32cdbd027ffe052016b0d8d3f3ee250993
2017-04-01 02:08:25 +00:00
Stephen Chen
dee09e7a5a Add friction icon for metered networks.
Also modified colors for dark theme compatibility.

Bug: 36100548
Bug: 36099721
Test: make, screenshot
Change-Id: Ib19ba8d5f34ad6d7461849c9137520308f1e5e34
2017-03-31 17:44:18 -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
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
Maurice Lam
a857c8da4f Sticky footer for GLIF theme
For settings screens using GLIF theme, update to sticky footers.

Test: Existing tests pass
Bug: 35448201
Change-Id: If26e7e25f7f02b4c24979503e0c9359b88ff16d1
2017-03-31 11:54:39 -07:00
Doris Ling
a2fdd19e0b Update text for USB mode selection dialog.
- create separate strings to be used for the USB preference summary.
- reverted the previous changes made to change the verb in the usb
preference title.
- updated the summary text for the usb selection description for charge
only.

Bug: 36234108
Test: builds
Change-Id: I4a57ecd6f9be4b3c10885ac1bbba76ff3df02b84
2017-03-31 11:09:07 -07:00