TreeHugger Robot
d4bfa472a8
Merge "Import translations. DO NOT MERGE"
2017-04-07 03:56:26 +00:00
Doris Ling
17d103e9d3
Merge "Add summary text for Encryption & credential." into oc-dev am: 65682e7fa5
...
am: 64c8244524
2017-04-07 02:55:03 +00:00
Doris Ling
64c8244524
Merge "Add summary text for Encryption & credential." into oc-dev
...
am: 65682e7fa5
2017-04-07 02:47:53 +00:00
TreeHugger Robot
65682e7fa5
Merge "Add summary text for Encryption & credential." into oc-dev
2017-04-07 02:40:13 +00:00
Doris Ling
388a138fd6
Merge "Update summary text for Trust agent." into oc-dev am: b9a54bae08
...
am: 4e33cc1279
2017-04-07 02:21:17 +00:00
Doris Ling
4e33cc1279
Merge "Update summary text for Trust agent." into oc-dev
...
am: b9a54bae08
2017-04-07 02:17:22 +00:00
TreeHugger Robot
b9a54bae08
Merge "Update summary text for Trust agent." into oc-dev
2017-04-07 02:09:36 +00:00
Doris Ling
2db8c867d1
Update summary text for Trust agent.
...
Update the summary text to show the number of active trust agent.
Bug: 36540633
Test: make RunSettingsRoboTests
Change-Id: I6627564a8356022c89694c84cfd47e875a0916b1
2017-04-06 17:29:12 -07:00
Daniel Nishi
016a8d4768
Merge ""% used" instead of "% full" in storage donut." into oc-dev am: b52a341914
...
am: 11bd2c3084
2017-04-06 23:46:03 +00:00
Doris Ling
415ce9a77d
Add summary text for Encryption & credential.
...
Add the static summary to the preference in the xml.
Bug: 36540633
Test: visual
Change-Id: Ie1bb01a42acf969e26c3c9b036d2db68d1817e97
2017-04-06 16:31:02 -07:00
Daniel Nishi
11bd2c3084
Merge ""% used" instead of "% full" in storage donut." into oc-dev
...
am: b52a341914
2017-04-06 23:25:10 +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
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
2017-04-06 23:03:55 +00:00
jackqdyulei
672a85aaa5
Merge "Update foreground string in battery page" into oc-dev
...
am: 020bb3bb99
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
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
Bill Yi
b9145e117d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 36981734
Change-Id: I0412483ef75fe79073ea6cfbcf8cb3faa71ccb97
2017-04-06 12:13:50 -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
2017-04-06 17:20:21 +00:00
Doris Ling
5221d1cd0a
Merge "Re-order the display settings items." into oc-dev
...
am: 5a03e321bc
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
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
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
2017-04-06 01:37:26 +00:00
Doris Ling
3e62570b05
Merge "Add resource string for Security dashboard summary." into oc-dev
...
am: 8c215807b2
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
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
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
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
Tony Mantler
c7956d80e6
Merge "Add AvailableVirtualKeyboardFragment to TV" into oc-dev
...
am: 30ce1bee20
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
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
2017-04-04 17:38:29 +00:00
