Commit Graph

9123 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Daniel Nishi
2ef20fb36d Add downloads to the deletion helper.
This adds a deletion service to delete files in the Downloads
folder. All of the files there are collected and offered to the
user to delete.

Bug: 28621781
Change-Id: I94431f9abc3a0afa2d07dbab763312c09e830aef
2016-05-13 13:35:37 -07:00
Makoto Onuki
dc3bb2798a Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev am: a23cd4614f
am: f4ffd6daff

* commit 'f4ffd6daff1a626d196e30cdebcbf913f936714e':
  ShortcutManager: Remove developer option from NYC

Change-Id: I7689577ee57a58d1abdb4690c453f6a9cadfa251
2016-05-13 18:59:31 +00:00
Makoto Onuki
446e5a536e Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
am: a23cd4614f

* commit 'a23cd4614f0341051e85c3dbdb7766d09c089947':
  ShortcutManager: Remove developer option from NYC

Change-Id: Icd507fcaba578122e50f4fc86e53bd65b4cac1fb
2016-05-13 18:57:00 +00:00
Makoto Onuki
f4ffd6daff Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev
am: a23cd4614f

* commit 'a23cd4614f0341051e85c3dbdb7766d09c089947':
  ShortcutManager: Remove developer option from NYC

Change-Id: Ie49323be5bb7f8b5e258ecb40382463e3cbb847b
2016-05-13 18:57:00 +00:00
Makoto Onuki
a23cd4614f Merge "ShortcutManager: Remove developer option from NYC" into nyc-dev 2016-05-13 18:51:41 +00:00
Makoto Onuki
d819814c63 ShortcutManager: Remove developer option from NYC
Bug 28704708

Change-Id: Ib2301ea556104e9ffd6a18885e228717843d6acb
2016-05-13 09:40:26 -07:00
Maurice Lam
5e292d249c Set fingerprint accent/primary color
Bug: 28728613
Change-Id: Id3b2d0b6ca7cbff1dd695a7a6cd5d93988d29077
2016-05-12 18:06:14 -07:00
Adrian Roos
3b7eedabb8 Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev am: ef505d628a
am: 1d1ca8e590

* commit '1d1ca8e5905c100efde0ffdfcc8b1dcc7dbc32c8':
  Allow DPMs to restrict Remote Input on Keyguard

Change-Id: I2e2310c09f240beb92146d8d24c4bc6fdc413364
2016-05-12 21:02:28 +00:00
Adrian Roos
e7c67aae22 Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
am: ef505d628a

* commit 'ef505d628ae96f175fca871013da8c24271667dc':
  Allow DPMs to restrict Remote Input on Keyguard

Change-Id: Ieaa1f148c3db5fc41e1bb51faf987eac1b896bd4
2016-05-12 21:00:03 +00:00
Adrian Roos
1d1ca8e590 Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev
am: ef505d628a

* commit 'ef505d628ae96f175fca871013da8c24271667dc':
  Allow DPMs to restrict Remote Input on Keyguard

Change-Id: I5746a924564e8eb866b0c0e0a1e0205a38896f89
2016-05-12 20:59:47 +00:00
Adrian Roos
ef505d628a Merge "Allow DPMs to restrict Remote Input on Keyguard" into nyc-dev 2016-05-12 20:52:25 +00:00
Adrian Roos
059b0fa060 Allow DPMs to restrict Remote Input on Keyguard
Change-Id: I84b90b4047129794f1397351f9c8624f0048ad41
Fixes: 26981262
2016-05-12 19:12:17 +00:00
Fan Zhang
1fb38d03bf Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev
am: f5746f9078

* commit 'f5746f90781c40380f8ec3057abcf9c67d830882':
  Update suggestion/support UI to use more negative space.

Change-Id: Ie1f58f267b284735b7f2c86741a516d385f07530
2016-05-12 18:51:10 +00:00
Fan Zhang
f5746f9078 Merge "Update suggestion/support UI to use more negative space." into nyc-mr1-dev 2016-05-12 18:41:11 +00:00
Fan Zhang
50cde75ef7 Update suggestion/support UI to use more negative space.
Bug: 28435214

-- Tweaked layout and padding in suggestions and support tab.
-- Added support to show different text color in SlidingTabLayout.

Change-Id: If5d90ec5360e35565176aae7475e355c27fcef7c
2016-05-12 11:14:59 -07:00
Maurice Lam
6de1c7e4f0 Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev am: aead073d44
am: 3fdb526bbd

* commit '3fdb526bbd7959ea5959922d86387232063b91a9':
  Set Wi-Fi dialog spinners to 48dps tall

Change-Id: Ib86a8883fd042f796fa83e9a9b341c94efea89a6
2016-05-12 17:50:44 +00:00
Maurice Lam
3fdb526bbd Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
am: aead073d44

* commit 'aead073d4494c6b764cb384cdb96c79ec5a37aa5':
  Set Wi-Fi dialog spinners to 48dps tall

Change-Id: I66c985b54718ff2a6e66b54ba67d4ccae44a09c6
2016-05-12 17:47:46 +00:00
Maurice Lam
d0035fd621 Merge "Set Wi-Fi dialog spinners to 48dps tall" into nyc-dev
am: aead073d44

* commit 'aead073d4494c6b764cb384cdb96c79ec5a37aa5':
  Set Wi-Fi dialog spinners to 48dps tall

Change-Id: I130a82b74299ec5f358f6040e54974e4661e6dbb
2016-05-12 17:47:45 +00:00