Commit Graph

11565 Commits

Author SHA1 Message Date
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
jackqdyulei
9d78a655fa Merge "Fix crash when clicking item in Battery screen" into oc-dev am: bac9b527e7
am: 23f8052652

Change-Id: Ie1895e12f4628dd80aca7eeb41bcbeac9599dc0e
2017-04-06 23:03:55 +00:00
jackqdyulei
672a85aaa5 Merge "Update foreground string in battery page" into oc-dev
am: 020bb3bb99

Change-Id: Ie23192f5e28c274e6d750dfa28effc8d17c3b762
2017-04-06 22:35:29 +00:00
TreeHugger Robot
020bb3bb99 Merge "Update foreground string in battery page" into oc-dev 2017-04-06 22:25:55 +00:00
jackqdyulei
23f8052652 Merge "Fix crash when clicking item in Battery screen" into oc-dev
am: bac9b527e7

Change-Id: I5ebed1fea938019771aecf964bfe54bcbc6f156b
2017-04-06 22:00:23 +00:00
TreeHugger Robot
bac9b527e7 Merge "Fix crash when clicking item in Battery screen" into oc-dev 2017-04-06 21:50:07 +00:00
jackqdyulei
fefdd5d47f Fix crash when clicking item in Battery screen
"last full charge/Screen usage since full charge" goes crash when
clicking on it. This is because The default behaviour for
PowerGaugePreference is to start detail page and the above two items
are PowerGaugePreference.

This cl set these two items as non-selectable.

Bug: 37080048
Test: make -j40 SettingsTest
Change-Id: Ide4e151dcd0b44fb795a5753c91f2197b2a24a56
2017-04-06 12:52:50 -07:00
Bill Yi
e224be20a1 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 36981734
Change-Id: I2d0ef02f962fd737c6269feb97dc9ca9336671a5
2017-04-06 12:36:34 -07:00
Maurice Lam
0ed1d928d4 Merge "Make GLIF v2 available to OEMs" 2017-04-06 18:42:38 +00:00
Doris Ling
766643750a Merge "Re-order the display settings items." into oc-dev am: 5a03e321bc
am: 5221d1cd0a

Change-Id: Icabaab149f5fbe5d816cd7b8d440ff5593fa4e3b
2017-04-06 17:20:21 +00:00
Doris Ling
5221d1cd0a Merge "Re-order the display settings items." into oc-dev
am: 5a03e321bc

Change-Id: Icf9d83dba0422af57fdd5dd7b7a158ed900ee08f
2017-04-06 17:07:26 +00:00
Doris Ling
5a03e321bc Merge "Re-order the display settings items." into oc-dev 2017-04-06 17:01:46 +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
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
Maurice Lam
e0e81b68c6 Make GLIF v2 available to OEMs
Rename GLIF Pixel to GLIF v2 and make available to OEMs. In this
model settings read the EXTRA_THEME from the intent and picks between
GLIF and GLIF v2.

Test: Manual
Bug: 36857917
Change-Id: I4899a3d041abaf0b97843cf14affc8d6f9587a22
2017-04-05 21:59:28 +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
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
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
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