Kenny Guy
6468225b40
Merge "Update work challenge background image." into nyc-dev am: 726085c5c7
am: 01891c5bf0
...
am: 8da57a60f8
* commit '8da57a60f8e1a61a2e835fb95fd2049a12021a6d':
Update work challenge background image.
Change-Id: Ie1f18ff1c0eaee38362b1432fc26698ecca79ce3
2016-05-19 11:14:37 +00:00
Kenny Guy
8da57a60f8
Merge "Update work challenge background image." into nyc-dev am: 726085c5c7
...
am: 01891c5bf0
* commit '01891c5bf07db8df50bac4b3f21744187815557e':
Update work challenge background image.
Change-Id: I7f41624bd0918f9127c934cfaf15e8762be35c0a
2016-05-19 11:11:08 +00:00
Kenny Guy
01891c5bf0
Merge "Update work challenge background image." into nyc-dev
...
am: 726085c5c7
* commit '726085c5c7016a828850580a21e09d2330a20ce4':
Update work challenge background image.
Change-Id: Iadf215b82f1753c88471acad41ff70fe3242e65a
2016-05-19 11:07:59 +00:00
Kenny Guy
cdc59c8709
Merge "Update work challenge background image." into nyc-dev
...
am: 726085c5c7
* commit '726085c5c7016a828850580a21e09d2330a20ce4':
Update work challenge background image.
Change-Id: Ie16ea20b5c848814d9bd48b1c704f6a3cc73d35c
2016-05-19 11:07:59 +00:00
Kenny Guy
726085c5c7
Merge "Update work challenge background image." into nyc-dev
2016-05-19 11:01:37 +00:00
TreeHugger Robot
35a058ce8c
Merge "Display total storage for Internal shared storage."
2016-05-18 22:35:27 +00:00
Baligh Uddin
7ffeda3633
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-05-18 19:06:53 +00:00
Baligh Uddin
be840c80cb
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-05-18 19:06:48 +00:00
Baligh Uddin
946a0ead3c
Merge "Import translations. DO NOT MERGE"
2016-05-18 18:56:47 +00:00
Daniel Nishi
0216e9dc2e
Add an upsell dialog to activate the storage manager.
...
After a manual clear, the user will be prompted to turn
on the storage manager, if it is turned off. The prompt
will only show up after certain defined delay times and
stop showing up entirely if denied enough times.
Currently, the dialog does not actually turn on the storage
manager because the storage manager is not yet landed.
Bug: 28801159
Change-Id: I3c221786d08a7102b3b5357416ab12692d1894cf
2016-05-18 09:25:38 -07:00
Kenny Guy
846e182385
Update work challenge background image.
...
Updated so the orange briefcase in the image
isn't central so avoiding clashing with text.
Bug: 28557192
Change-Id: Ic8e4ea71f47449e81619b28b979f59c3d9aaf6a0
2016-05-18 16:14:19 +01:00
pkanwar
553eef0d12
Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b
am: edb9f49afe
...
am: 2a0f73ab89
* commit '2a0f73ab89ae4587ce66b2daa983dcb0d83bf060':
Choose Bluetooth Device window cant't fill screen
Change-Id: I6908ae584f85cf48cbe1d4055dcf3b858c8460b1
2016-05-17 22:40:45 +00:00
Pankaj Kanwar
2a0f73ab89
Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b
...
am: edb9f49afe
* commit 'edb9f49afeabec1c1df7e1509c4f2f5567cc075a':
Choose Bluetooth Device window cant't fill screen
Change-Id: I78d24c405566eaa5da282bbb2042d0c6f0d3cf40
2016-05-17 22:36:03 +00:00
pkanwar
edb9f49afe
Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev
...
am: 4dd2fdf90b
* commit '4dd2fdf90b97b64931cbb1c7ca69b38cef58662e':
Choose Bluetooth Device window cant't fill screen
Change-Id: I92577a0d913f0b8436df28708dc6d84c5c82c01a
2016-05-17 22:31:17 +00:00
pkanwar
23e8435899
Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev
...
am: 4dd2fdf90b
* commit '4dd2fdf90b97b64931cbb1c7ca69b38cef58662e':
Choose Bluetooth Device window cant't fill screen
Change-Id: I3134f37ab8e0ac3e7367d26141c4a882051e8652
2016-05-17 22:31:15 +00:00
Pankaj Kanwar
4dd2fdf90b
Merge "Choose Bluetooth Device window cant't fill screen" into nyc-dev
2016-05-17 22:16:49 +00:00
pkanwar
956597eaf8
Choose Bluetooth Device window cant't fill screen
...
b/28684861: fixed the layout file to ensure that the separators cover
the entire screen.
Change-Id: I4471a1da901c9a4c0830ff0dfc943cd087ee1702
2016-05-17 12:03:42 -07:00
Daniel Nishi
d0f1b67ed3
Merge "Add the automatic storage manager settings." into nyc-mr1-dev am: 699efba106
...
am: 2582b5f108
* commit '2582b5f108759362bd05e04b5f368c58f43194fc':
Add the automatic storage manager settings.
Change-Id: Ib24111573bd46be4fe8e327c4dd38170d04adc37
2016-05-17 18:50:41 +00:00
Daniel Nishi
2582b5f108
Merge "Add the automatic storage manager settings." into nyc-mr1-dev
...
am: 699efba106
* commit '699efba10667eb18bd28de02aebb549257baf53e':
Add the automatic storage manager settings.
Change-Id: I7518c8784a43ee522ebc3ff06097c474b24d2725
2016-05-17 18:41:51 +00:00
Daniel Nishi
699efba106
Merge "Add the automatic storage manager settings." into nyc-mr1-dev
2016-05-17 18:10:53 +00:00
Rachel Zhang
55cd13f44a
Merge "Remove settings overflow menu" into nyc-mr1-dev am: 97a8db3c8a
...
am: f5239e1e7c
* commit 'f5239e1e7c2e665b821400c5e0ce5daa9e82c592':
Remove settings overflow menu
Change-Id: Ib58b8d2942cf2db0540faaf33315c72d3c4a8c00
2016-05-17 16:59:03 +00:00
Rachel Zhang
f5239e1e7c
Merge "Remove settings overflow menu" into nyc-mr1-dev
...
am: 97a8db3c8a
* commit '97a8db3c8af60ffa381347963a0ccaf700a71ee7':
Remove settings overflow menu
Change-Id: I081b2dab824053294749995deb41147c8620a57a
2016-05-17 16:56:20 +00:00
Rachel Zhang
97a8db3c8a
Merge "Remove settings overflow menu" into nyc-mr1-dev
2016-05-17 16:51:25 +00:00
Daniel Nishi
116a55cdab
Add the automatic storage manager settings.
...
This provides a toggle for changing if the storage manager
is turned on or off and how many days of data to retain.
It is currently not hooked up to anything currently and only acts as
the view, pending b/28600825.
Bug: 28560570
Change-Id: Iaa2d819f26addab4dc02ced80e9ba79e0fcf0980
2016-05-17 09:32:12 -07:00
Daniel Nishi
d8c0d970d6
Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev am: e86eae854c
...
am: 8ab8e4c6c4
* commit '8ab8e4c6c42a24fe60799a27edbbd4e04a9ce4e2':
Add an alert dialog before clearing data in deletion helper.
Change-Id: I2c47aeb1e604cb4628d2e7f711ba22bd1e2215d7
2016-05-17 16:28:45 +00:00
Daniel Nishi
8ab8e4c6c4
Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev
...
am: e86eae854c
* commit 'e86eae854cb8c31d67497578dc5ba78ae50e8d8e':
Add an alert dialog before clearing data in deletion helper.
Change-Id: Ide9c26bcfa719b812eecec43ef63ca6f7a8f0a54
2016-05-17 16:26:12 +00:00
Daniel Nishi
e86eae854c
Merge "Add an alert dialog before clearing data in deletion helper." into nyc-mr1-dev
2016-05-17 16:21:27 +00:00
shwetachahar
66b46ff31f
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev am: 1cb87b2af5
am: b34112820a
...
am: b30db5ebd9
* commit 'b30db5ebd972bc467bc78faa647a038a64f6a583':
Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.
Change-Id: Ic90bf5c75ff189b0f5c0a0b15d56ae6950846f53
2016-05-17 14:37:39 +00:00
Shweta Chahar
b30db5ebd9
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev am: 1cb87b2af5
...
am: b34112820a
* commit 'b34112820a7dcee3a85a8e7163b194f614a9e840':
Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.
Change-Id: Ie097c2500e58c7cf6472b3f8962c59f376f8b6bf
2016-05-17 14:34:55 +00:00
shwetachahar
d16f4fd531
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
...
am: 1cb87b2af5
* commit '1cb87b2af57df71d56951c43aa28b8d01b4fb2a7':
Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.
Change-Id: Id9f34074524813aedcf2994fd1a424b5e2b0185c
2016-05-17 14:32:45 +00:00
shwetachahar
b34112820a
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
...
am: 1cb87b2af5
* commit '1cb87b2af57df71d56951c43aa28b8d01b4fb2a7':
Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.
Change-Id: I72f2a0a95aadb87031ab53c9d2479f45f3e452ef
2016-05-17 14:32:16 +00:00
Shweta Chahar
1cb87b2af5
Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev
2016-05-17 14:27:09 +00:00
shwetachahar
43d93289ba
Modify the TTS engine preference UI so that the radio button and the TTS
...
engine name are a single focusable element.
Bug: 27136946
Change-Id: I502634e0942b9fe30e290ce9de6ba293f33bf863
2016-05-17 13:56:57 +01:00
Baligh Uddin
61e61931e6
Import translations. DO NOT MERGE
...
Change-Id: I6b058c724477ba0095e43fe4d78460ffff4893e5
Auto-generated-cl: translation import
2016-05-16 23:51:59 -07:00
Baligh Uddin
e5e29d5073
Import translations. DO NOT MERGE
...
Change-Id: I1f10df22a0d22c5408d2c1cc83441e19ffa28405
Auto-generated-cl: translation import
2016-05-16 23:39:18 -07:00
Baligh Uddin
e896cb7519
Import translations. DO NOT MERGE
...
Change-Id: I445f622f50145fa550439715192e744fd2cc79e9
Auto-generated-cl: translation import
2016-05-16 22:36:38 -07:00
Maurice Lam
a275fdd5ac
Merge "Set fingerprint accent/primary color" into nyc-mr1-dev am: 8c64604d16
...
am: ee5af0f825
* commit 'ee5af0f82532754df16a12e9d8f668eadce9562d':
Set fingerprint accent/primary color
Change-Id: I0585f0307e85b8344e7a9a1d4ebba613913bc96d
2016-05-16 23:42:31 +00:00
Maurice Lam
ee5af0f825
Merge "Set fingerprint accent/primary color" into nyc-mr1-dev
...
am: 8c64604d16
* commit '8c64604d16500a43e607d0517605d5d62b4108c6':
Set fingerprint accent/primary color
Change-Id: Iabc41c0cfaa160e575c19858a48ac27ad54fe8af
2016-05-16 23:38:36 +00:00
Maurice Lam
8c64604d16
Merge "Set fingerprint accent/primary color" into nyc-mr1-dev
2016-05-16 23:25:29 +00:00
Daniel Nishi
46c32b9e32
Add an alert dialog before clearing data in deletion helper.
...
The dialog states how much space will be freed by the deletion
and prompts the user to either cancel or continue with the
deletion.
BUG: 28762412
Change-Id: I8db2a8f928c82ebaa2cf5fea030b6b6f4730eb3e
2016-05-16 15:36:28 -07:00
Rachel Zhang
471815e4bd
Remove settings overflow menu
...
Bug: 28139684
Change-Id: I099af85878fde5f2317be312f979994fbbc87287
2016-05-16 13:43:51 -07:00
Sudheer Shanka
2753def6b2
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev am: 31fb2a7a1d
am: 7cc2fa51d1
...
am: f114a556fe
* commit 'f114a556fedb84a0f82925360431abaa7d034bc5':
Fix crash in SetupRedactionInterstitial.
Change-Id: Ic0cb5a47169da68260a1384e21549d7843fa708a
2016-05-16 20:27:37 +00:00
Sudheer Shanka
f114a556fe
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev am: 31fb2a7a1d
...
am: 7cc2fa51d1
* commit '7cc2fa51d1dc40a85f88a86c748c039b81a6af46':
Fix crash in SetupRedactionInterstitial.
Change-Id: I6b924c3a07fb51b29e39fb18c7af5e3038f472fd
2016-05-16 20:24:58 +00:00
Sudheer Shanka
7cc2fa51d1
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
...
am: 31fb2a7a1d
* commit '31fb2a7a1d3ee27ad7f47fb26cd5900b033ef24d':
Fix crash in SetupRedactionInterstitial.
Change-Id: I526e7fe3e9c11bb36babc386c1cbbcb0187e6bbd
2016-05-16 20:22:31 +00:00
Sudheer Shanka
5581312428
Merge "Fix crash in SetupRedactionInterstitial." into nyc-dev
...
am: 31fb2a7a1d
* commit '31fb2a7a1d3ee27ad7f47fb26cd5900b033ef24d':
Fix crash in SetupRedactionInterstitial.
Change-Id: I55d25ec0d3fc06ba099aec098220500ed7c8d61f
2016-05-16 20:22:30 +00:00
Sudheer Shanka
dc3ed0a5bf
Fix crash in SetupRedactionInterstitial.
...
Change-Id: Ia662cd60e4c9eeaccd0eb168431e755c2c79b676
Fixes: 28785168
2016-05-16 11:46:34 -07:00
Jiaquan He
fe4e80b98b
Add an option allowing to skip wallpaper apps selection.
...
This commit adds an option to the Settings application, making it
possible to skip the wallpaper apps selecting and directly lead to
the wallpaper picker.
Bug: 28554244
Change-Id: Id93b69c397e7eec6fdf9fd2c5812fd359cae58c2
2016-05-16 18:08:34 +00:00
Daniel Nishi
07e9f774b0
Merge "Add downloads to the deletion helper." into nyc-mr1-dev am: 95c3c5045f
...
am: de98b25c01
* commit 'de98b25c01341663847252fceaf97d64ceafbb29':
Add downloads to the deletion helper.
Change-Id: I092289edbde4d9b439cb6a55ce2a507f5a36a444
2016-05-14 00:15:06 +00:00
Daniel Nishi
de98b25c01
Merge "Add downloads to the deletion helper." into nyc-mr1-dev
...
am: 95c3c5045f
* commit '95c3c5045fde4667e8085d69a0aba4b82126d682':
Add downloads to the deletion helper.
Change-Id: I192143eb333d584b4ec792913eda79d9614c6150
2016-05-14 00:12:32 +00:00
Felipe Leme
9c7bb2775a
Display total storage for Internal shared storage.
...
Prior to this change, Settings was using
volume.getPath().getTotalBytes() to calculate the total, which includes
the user-accessible storage, but not the internal partitions. As such,
the total displayed was often missing many GBs (for example, in a 32GB
device, it could display "12.09GB of 25.01GB used".
This change fix this problem by using the total size and creating a
"System" section containing the "missing" storage.
BUG: 24128505
Change-Id: Ic35cd7c8406eff16ac1d97c4b4c233ecde64a6e1
2016-05-13 15:40:34 -07:00