Doris Ling
0c39be8889
Merge "Update USb preference controller to use the new summary texts." into oc-dev am: e94ba3b55f
...
am: 8f3be96ba8
2017-04-07 02:36:58 +00:00
Doris Ling
8f3be96ba8
Merge "Update USb preference controller to use the new summary texts." into oc-dev
...
am: e94ba3b55f
2017-04-07 02:33:01 +00:00
TreeHugger Robot
e94ba3b55f
Merge "Update USb preference controller to use the new summary texts." into oc-dev
2017-04-07 02:27:55 +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
222fe7d8a1
Merge "Add subtext to Default apps." into oc-dev am: 1e775c117a
...
am: 3da90f7f1c
2017-04-07 02:03:00 +00:00
Doris Ling
3da90f7f1c
Merge "Add subtext to Default apps." into oc-dev
...
am: 1e775c117a
2017-04-07 01:54:46 +00:00
Lei Yu
edeb58d023
Merge "Remove PowerUsageDetail.java" into oc-dev am: bde7097fb9
...
am: 20dcdfe2cf
2017-04-07 01:47:09 +00:00
TreeHugger Robot
1e775c117a
Merge "Add subtext to Default apps." into oc-dev
2017-04-07 01:41:51 +00:00
Lei Yu
20dcdfe2cf
Merge "Remove PowerUsageDetail.java" into oc-dev
...
am: bde7097fb9
2017-04-07 01:39:25 +00:00
Lei Yu
bde7097fb9
Merge "Remove PowerUsageDetail.java" into oc-dev
2017-04-07 01:34:37 +00:00
Marie Janssen
45eb80a8ab
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev am: b26584cf1a
...
am: 6f17c0dada
2017-04-07 00:58:22 +00:00
Andrew Zeng
585c09b7f8
Merge "Use MIN_LOCK_PASSWORD_SIZE as min password length."
2017-04-07 00:52:02 +00:00
Marie Janssen
6f17c0dada
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev
...
am: b26584cf1a
2017-04-07 00:50:54 +00:00
TreeHugger Robot
b26584cf1a
Merge "Bluetooth: only unregisterReceiver if we register" into oc-dev
2017-04-07 00:42:05 +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
Doris Ling
d007ff9395
Add subtext to Default apps.
...
Retrieve the default Sms app, default Browser app, and default Phone app
and append the label together to form the summary text for Default apps
settings.
Bug: 36376411
Test: make RunSettingsRoboTests
Change-Id: I8ccf71dde43bba04c4bc4a900c9a181513e7710b
2017-04-07 00:10:39 +00: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
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
Daniel Nishi
a1edaff22c
Merge "Re-add the option to migrate data back." into oc-dev am: c660755348
...
am: 54cadd92d9
2017-04-06 23:17:15 +00:00
Daniel Nishi
54cadd92d9
Merge "Re-add the option to migrate data back." into oc-dev
...
am: c660755348
2017-04-06 23:04:36 +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
Daniel Nishi
c660755348
Merge "Re-add the option to migrate data back." into oc-dev
2017-04-06 22:49:24 +00:00
Andrew Zeng
233d88a277
Use MIN_LOCK_PASSWORD_SIZE as min password length.
...
Currently MIN_LOCK_PASSWORD_SIZE=MIN_LOCK_PATTERN_SIZE, so there
shouldn't be any behavior changes stemming from this.
Change-Id: I15369723e7fd0cc3fe8230c9b450faf929fefd00
2017-04-06 15:39:58 -07: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
Bill Yi
06a20f2be9
Merge "Import translations. DO NOT MERGE" into oc-dev am: d67a6d7176 -s ours
...
am: 3f52ee79d7
2017-04-06 21:54:47 +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
Bill Yi
3f52ee79d7
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: d67a6d7176
2017-04-06 21:49:40 +00:00
TreeHugger Robot
d67a6d7176
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-06 21:44:11 +00:00
Daniel Nishi
f6b12274f1
Re-add the option to migrate data back.
...
Currently, users can use an SD card or USB drive and adopt it as
internal storage using existing flows. They can manage this drive
perfectly fine using the old storage screen, which is still around.
One functionality that was lost was the ability to migrate data from
the adopted drive back to the private internal storage. This appeared
in a dropdown in the old storage settings.
By duplicating the code to create just that specific menu item and its
click behavior, we can restore this functionality to the new storage
view.
Change-Id: Id0e01c560e7249acccfe86c5da44466dd58fe5d4
Merged-In: I4b8c06912d2c0b2c5be5bce8b217d45accf34d4b
Fixes: 35926028
Test: Settings Robotest
2017-04-06 13:57:00 -07:00
Doris Ling
76c325d46c
Merge "Add summary text to Display->Brightness level." into oc-dev am: ad69c46712
...
am: c48ef6dda1
2017-04-06 20:37:22 +00:00
Doris Ling
c48ef6dda1
Merge "Add summary text to Display->Brightness level." into oc-dev
...
am: ad69c46712
2017-04-06 20:33:14 +00:00
Doris Ling
ad69c46712
Merge "Add summary text to Display->Brightness level." into oc-dev
2017-04-06 20:03:24 +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
Doris Ling
eff691280a
Merge "Update summary for Connected devices->Printing." into oc-dev am: 4bbfdb13e7
...
am: 38fc861a62
2017-04-06 19:21:53 +00:00
Doris Ling
38fc861a62
Merge "Update summary for Connected devices->Printing." into oc-dev
...
am: 4bbfdb13e7
2017-04-06 18:43:14 +00:00
Maurice Lam
0ed1d928d4
Merge "Make GLIF v2 available to OEMs"
2017-04-06 18:42:38 +00:00
Doris Ling
4bbfdb13e7
Merge "Update summary for Connected devices->Printing." into oc-dev
2017-04-06 18:35:53 +00:00
Doris Ling
8071d18ad5
Merge "Update Wifi off summary text." into oc-dev am: 28e35fcf05
...
am: 0950fa569b
2017-04-06 17:20:52 +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
Christine Franks
fbf21f4c85
Merge "Prevent apps from displaying over Settings" into oc-dev am: 24596f51d5
...
am: 8606c652d5
2017-04-06 17:19:25 +00:00
Doris Ling
0950fa569b
Merge "Update Wifi off summary text." into oc-dev
...
am: 28e35fcf05
2017-04-06 17:08:04 +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
