Jack He
0ff39bc114
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06 am: 336a7ccca7
...
am: 075ee6109f
2017-04-10 23:32:11 +00:00
Jack He
075ee6109f
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2 am: 9e1e430f06
...
am: 336a7ccca7
2017-04-10 23:20:34 +00:00
Jack He
336a7ccca7
Merge "Add developer menu entry to enable Bluetooth inband ringing" am: 3d08bedba2
...
am: 9e1e430f06
2017-04-10 23:11:42 +00:00
TreeHugger Robot
99475b4c24
Merge "Import translations. DO NOT MERGE"
2017-04-08 08:19:01 +00:00
Lei Yu
e57622d5a4
Merge "Extend the translation limit to 60" into oc-dev am: 2a3a92b513
...
am: 451964a124
2017-04-07 21:11:53 +00:00
Lei Yu
451964a124
Merge "Extend the translation limit to 60" into oc-dev
...
am: 2a3a92b513
2017-04-07 21:08:11 +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
2017-04-07 20:12:28 +00:00
Doris Ling
f8dead2f40
Merge "Add summary text to Lock screen preferences." into oc-dev
...
am: a258e424a2
2017-04-07 20:07:55 +00:00
Andrew Sapperstein
11400c5e81
Merge "Increase char limit for adaptive brightness text." into oc-dev am: a9acbd924a
...
am: e6db78a2f1
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
Andrew Sapperstein
e6db78a2f1
Merge "Increase char limit for adaptive brightness text." into oc-dev
...
am: a9acbd924a
2017-04-07 20:02:37 +00:00
TreeHugger Robot
a9acbd924a
Merge "Increase char limit for adaptive brightness text." into oc-dev
2017-04-07 19:55:54 +00:00
Daniel Nishi
27d8d2b46e
Merge "Update the automatic storage management preferences." into oc-dev am: 7badf46542
...
am: af587b0cfc
2017-04-07 19:50:05 +00:00
Daniel Nishi
af587b0cfc
Merge "Update the automatic storage management preferences." into oc-dev
...
am: 7badf46542
2017-04-07 19:46:05 +00:00
Daniel Nishi
7badf46542
Merge "Update the automatic storage management preferences." into oc-dev
2017-04-07 19:38:27 +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
Bill Yi
4f1d3edfe6
Import translations. DO NOT MERGE
...
Change-Id: Iaa73edb3d34b6be32ce3d4e905883ea8dbd167cd
Auto-generated-cl: translation import
2017-04-07 09:10:36 -07:00
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
