Commit Graph

3756 Commits

Author SHA1 Message Date
Lei Yu
e57622d5a4 Merge "Extend the translation limit to 60" into oc-dev am: 2a3a92b513
am: 451964a124

Change-Id: I1aa65f1f4a9ec03ba61bfd981ec5386c5d38f631
2017-04-07 21:11:53 +00:00
Lei Yu
2a3a92b513 Merge "Extend the translation limit to 60" into oc-dev 2017-04-07 21:03:16 +00:00
Doris Ling
0ec7d2eb0d Merge "Add summary text to Lock screen preferences." into oc-dev am: a258e424a2
am: f8dead2f40

Change-Id: Id623c73b1bce56b3ec25a5b0dc7f4016a5fce72e
2017-04-07 20:12:28 +00:00
Andrew Sapperstein
11400c5e81 Merge "Increase char limit for adaptive brightness text." into oc-dev am: a9acbd924a
am: e6db78a2f1

Change-Id: I6123d1c36204bc87276d4170850a1c7d318c7eea
2017-04-07 20:06:36 +00:00
TreeHugger Robot
a258e424a2 Merge "Add summary text to Lock screen preferences." into oc-dev 2017-04-07 20:03:36 +00:00
TreeHugger Robot
0226581110 Merge "Fix encryption interstitial string" 2017-04-07 19:17:48 +00:00
Doris Ling
cee83e4bbf Add summary text to Lock screen preferences.
Each time we refresh the security preference page, get the current
summary text from "On the lock screen" and populate to Lock screen
preferences summary.

Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I317e3892b35b30981b62f7b7aee9cfdacd04a3ed
2017-04-07 11:11:45 -07:00
Maurice Lam
d034f261af Fix encryption interstitial string
Test: Manual
Bug: 36801908
Change-Id: Ib5a06cc557458a451a6aec645e8331e75850cb2e
2017-04-07 10:35:39 -07:00
jackqdyulei
145cb81c21 Extend the translation limit to 60
Bug: 36830908
Test: Build
Change-Id: Ib7664ac4e625701d928359104ef5e75d158e74ee
2017-04-07 10:29:58 -07:00
Andrew Sapperstein
12bdb22400 Increase char limit for adaptive brightness text.
Change-Id: I4bab996d94812cf9a2a148ef3dc1119c5dab7a8e
Fixes: 37014409
Test: string change
2017-04-07 17:23:30 +00:00
Daniel Nishi
016a8d4768 Merge ""% used" instead of "% full" in storage donut." into oc-dev am: b52a341914
am: 11bd2c3084

Change-Id: Ia8ed6a3bbc62bc8ffdaa38d6d5decaf3ba4836a0
2017-04-06 23:46:03 +00:00
Daniel Nishi
b52a341914 Merge ""% used" instead of "% full" in storage donut." into oc-dev 2017-04-06 23:19:18 +00:00
Daniel Nishi
262e56c67f Merge "Move the app_info_storage_title string." 2017-04-06 23:18:12 +00:00
jackqdyulei
1949de3f14 Merge "Update foreground string in battery page" into oc-dev am: 020bb3bb99
am: 672a85aaa5

Change-Id: I99e7010a60fd220668cc26f33eefe8f31ea767cf
2017-04-06 23:04:13 +00:00
TreeHugger Robot
020bb3bb99 Merge "Update foreground string in battery page" into oc-dev 2017-04-06 22:25:55 +00:00
TreeHugger Robot
ab86bf8244 Merge "Fixes instant apps on the Opening links screen" 2017-04-06 15:33:40 +00:00
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
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
TreeHugger Robot
8c215807b2 Merge "Add resource string for Security dashboard summary." into oc-dev 2017-04-06 01:25:06 +00:00
TreeHugger Robot
418e5bffda Merge "Fix crash when opening battery page" into oc-dev 2017-04-05 22:45:46 +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
Jesse Evans
1c218c8368 Fixes instant apps on the Opening links screen
Updates strings to the correct values.

Adds the Instant apps account preference, which launches the
instant apps accounts chooser.

Test: manual test of the settings screen.
Bug: 36514506
Change-Id: I876d0d242bf40a379a3737bc6422e2835fc17839
2017-04-04 16:03:47 -07:00
Daniel Nishi
d8915c5b10 Move the app_info_storage_title string.
Now it is with the other new storage titles.

Change-Id: Ia2d3338e1f0f1734fb7b65e45da1438afa8cca25
Fixes: 36601953
Test: Compiles.
2017-04-04 14:19:24 -07:00
Daniel Nishi
917ecaafd1 "% used" instead of "% full" in storage donut.
This aligns the string with the summary text on the top level
Settings view.

Change-Id: If7316bff48c9174cb9f72b5bf80e13f0c7b97066
Fixes: 36873524
Test: None for this string change.
2017-04-04 13:50:54 -07:00
TreeHugger Robot
30ce1bee20 Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev 2017-04-04 20:31:48 +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
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
jackqdyulei
6424c17e3d Update foreground string in battery page
Change foreground app title to "While in active use"

Bug: 36781909
Test: Build
Change-Id: Ideadc5f6efafe22b014380a5c023e4e5e6a47df5
2017-04-03 18:59:47 -07:00
TreeHugger Robot
b4e7b17223 Merge "Add AvailableVirtualKeyboardFragment to TV" 2017-04-03 22:04:18 +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
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
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
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
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
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
Jesse Evans
9209ee53ed 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-03-30 19:29:08 -07:00
jackqdyulei
b73e0d3f51 Update string for battery main page
Bug: 36576021
Test: Build
Change-Id: I60c43868dd54bfaf75648a9ac70a3ff5815180b6
(cherry picked from commit 630a8c054b)
2017-03-29 20:53:25 +00:00
TreeHugger Robot
28fbdc497d Merge "Update string for battery main page" 2017-03-29 20:52:08 +00:00
Doris Ling
ce7e043e1d Increase the char limit for the bluetooth tethering strings.
Longer summary text for the bluetooth tethering should be supported for
translation to other languages.

Bug: 36626585
Bug: 36627493
Bug: 36635108
Test: builds
Change-Id: Ia1409520443fd05c54a6c28fc292dd39b1c198b2
(cherry picked from commit 6d17af4d64)
2017-03-29 03:48:24 +00:00
TreeHugger Robot
c220e671ad Merge "Increase the char limit for the bluetooth tethering strings." 2017-03-29 01:16:52 +00:00
jackqdyulei
630a8c054b Update string for battery main page
Bug: 36576021
Test: Build
Change-Id: I60c43868dd54bfaf75648a9ac70a3ff5815180b6
2017-03-28 18:12:42 -07:00
TreeHugger Robot
9502f112e6 Merge "Use buttons for EncryptionInterstitial" 2017-03-28 23:11:41 +00:00