Yigit Boyar
8b88a85032
Merge "Fix generate layout params to preserve margins" into nyc-dev
2016-03-23 18:22:58 +00:00
John Reck
66d16f1214
Merge "Fix missing first frame" into nyc-dev
2016-03-23 18:22:36 +00:00
Adrian Roos
9b95f615c4
Merge "Ensure notification color contrast" into nyc-dev
2016-03-23 18:14:54 +00:00
Felipe Leme
b4fb50f8cc
Merge "Allow Scoped Directory Access on whole volume." into nyc-dev
...
am: 9eb5555
* commit '9eb5555aa6788ec948e7af8666a9155792b684f8':
Allow Scoped Directory Access on whole volume.
2016-03-23 18:03:27 +00:00
Peng Xu
d707fa3d00
[Sensor] Add a constant to match native header
...
am: 370985d
* commit '370985d00a04c0d6977929cd8daf05c932443b0d':
[Sensor] Add a constant to match native header
2016-03-23 18:03:25 +00:00
Felipe Leme
9eb5555aa6
Merge "Allow Scoped Directory Access on whole volume." into nyc-dev
2016-03-23 17:58:48 +00:00
Peng Xu
370985d00a
[Sensor] Add a constant to match native header
...
This CL add private sensor type base constant to java file to match
C header file.
It is defined that all vendor sensor types have to be >= 0x10000.
There is a constant in sensor.h for reference. However, there is
no such constant defined in Sensor.java before. This CL adds it.
Change-Id: Ia8f8c06583c62879e51779815051c346f1a9cd14
(cherry picked from commit 1795e14dab0367fdd77f2c1eee6b4fd39d1c5902)
2016-03-23 17:51:02 +00:00
Adrian Roos
4ff3b120ff
Ensure notification color contrast
...
Ensure we have at least 3:1 contrast for the
action buttons. Also ensures that the inline
reply box background has 4.5:1 contrast to white.
Further modifies the color of the inline reply
background to satisfy a 4.5:1 contrast ratio for
the entered text.
Bug: 26831312
Change-Id: If42b1c99d1adee547d0a583c1a69c48ef7287c23
2016-03-23 10:49:40 -07:00
Amith Yamasani
f749d26fa4
Merge "Move device idle logic into a job StateController" into nyc-dev
...
am: 10ae65d
* commit '10ae65d226ac9205d53fabc3b9c9e53e1c642076':
Move device idle logic into a job StateController
2016-03-23 17:40:08 +00:00
Abhijith Shastry
196ca8ef2f
Merge "Document that re-inserting the same blocked number is permitted." into nyc-dev
...
am: 6ec134d
* commit '6ec134dc0d6de2a4dd708dbecd27e5f667c9371c':
Document that re-inserting the same blocked number is permitted.
2016-03-23 17:40:07 +00:00
Philip P. Moltmann
e2125f4cdb
Merge "Deal with print-preview renderings that do not match the correct number of pages." into nyc-dev
...
am: 49435a7
* commit '49435a72955fd6d2673ac33c34e2417c96fd87fb':
Deal with print-preview renderings that do not match the correct number of pages.
2016-03-23 17:32:17 +00:00
Amith Yamasani
10ae65d226
Merge "Move device idle logic into a job StateController" into nyc-dev
2016-03-23 17:32:06 +00:00
Abhijith Shastry
6ec134dc0d
Merge "Document that re-inserting the same blocked number is permitted." into nyc-dev
2016-03-23 17:29:08 +00:00
Philip P. Moltmann
49435a7295
Merge "Deal with print-preview renderings that do not match the correct number of pages." into nyc-dev
2016-03-23 17:17:40 +00:00
Michal Karpinski
4a6a538df9
Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev
...
am: 8aa976b
* commit '8aa976b60b0b638a77f9007fa6d1a247815d4b09':
Remove legacy DeviceLogging methods from DPM
2016-03-23 17:00:44 +00:00
Michal Karpinski
8aa976b60b
Merge "Remove legacy DeviceLogging methods from DPM" into nyc-dev
2016-03-23 16:51:55 +00:00
Pablo Ceballos
38f18683b2
Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev
...
am: 6266d8c
* commit '6266d8c959806a359571b0833702fbe46e9748f9':
Java bindings for SurfaceControl::setFinalCrop
2016-03-23 16:42:12 +00:00
Chris Banes
d4534a3d9d
Merge "Allow AlertDialog to be used in a DialogFragment" into nyc-dev
...
am: a62a0f7
* commit 'a62a0f72864533f2de5d1cd311ed5030c293aa2d':
Allow AlertDialog to be used in a DialogFragment
2016-03-23 16:34:51 +00:00
Pablo Ceballos
6266d8c959
Merge "Java bindings for SurfaceControl::setFinalCrop" into nyc-dev
2016-03-23 16:30:54 +00:00
Chris Banes
a62a0f7286
Merge "Allow AlertDialog to be used in a DialogFragment" into nyc-dev
2016-03-23 16:25:53 +00:00
Chris Banes
ccf8e661c7
Allow AlertDialog to be used in a DialogFragment
...
AlertController calls requestWindowFeature() too
later for DialogFragment. Fixed by moving it to the
constructor.
BUG: 27809055
Change-Id: Icef01316b4e857b41ccc29cc56bbcecd7f629342
2016-03-23 16:20:00 +00:00
Abodunrinwa Toki
f99cbc8735
Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev
...
am: ae64758
* commit 'ae64758eddecec9cb90b6c540fa4687c7f2b2078':
Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS
2016-03-23 16:11:05 +00:00
Abodunrinwa Toki
ae64758edd
Merge "Replace Settings.ACTION_KEYBOARD_LAYOUT_SETTINGS with Settings.ACTION_HARD_KEYBOARD_SETTINGS" into nyc-dev
2016-03-23 16:02:36 +00:00
Kenny Root
8a6c191094
Use canonical name for SHA1withECDSA
...
The Standard Names documentation says that "ECDSA" should not be used
due to its ambiguity. Bouncycastle has switched from "ECDSA" to
"SHA1withECDSA" so therefore we should switch this "workaround" Provider
to use the same name to keep it functioning correctly.
Bug: 27753949
Change-Id: I5acfca9d89c85bf005902a2f06cb5d7b1ef9dff2
2016-03-23 08:52:28 -07:00
John Reck
417ed6d433
Fix missing first frame
...
Bug: 26776366
Change-Id: I46258c0ff35fdefe5c9f2ee610c904b2dbe8c5d9
2016-03-23 07:59:10 -07:00
Geoff Mendal
5ac3c33b8b
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: df1e2b1 -s ours
* commit 'df1e2b1457690ccbd1302078cedafbfbb8918265':
Import translations. DO NOT MERGE
2016-03-23 14:49:29 +00:00
Geoff Mendal
df1e2b1457
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-23 14:39:31 +00:00
Geoff Mendal
dbfe108266
Import translations. DO NOT MERGE
...
Change-Id: Ib474fe3cbe01716c7c62e7d1775cd1c4926e6288
Auto-generated-cl: translation import
2016-03-23 07:36:44 -07:00
Geoff Mendal
b05ee1ba35
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: b568576 -s ours
* commit 'b5685764727d93ff2e6dd59249464dded120947f':
Import translations. DO NOT MERGE
2016-03-23 14:35:01 +00:00
Geoff Mendal
7bd095722a
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: fcdf51c -s ours
* commit 'fcdf51ced4dc61aa379f51ad9c2f579bf11b68fe':
Import translations. DO NOT MERGE
2016-03-23 14:34:59 +00:00
Geoff Mendal
cb46f05e6a
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 1bbbb1d -s ours
* commit '1bbbb1ddb7de1ff557e4c9c3cc950a5437034164':
Import translations. DO NOT MERGE
2016-03-23 14:34:57 +00:00
Geoff Mendal
b568576472
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-23 14:25:59 +00:00
Geoff Mendal
fcdf51ced4
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-23 14:25:41 +00:00
Geoff Mendal
1bbbb1ddb7
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-23 14:25:25 +00:00
Geoff Mendal
d65a05e5f1
Import translations. DO NOT MERGE
...
Change-Id: I78231875388818087268e1386bdf02165c745f18
Auto-generated-cl: translation import
2016-03-23 07:23:38 -07:00
Geoff Mendal
0164619095
Import translations. DO NOT MERGE
...
Change-Id: Idaa94a612de604c1e7178359a12ccab87ff154ce
Auto-generated-cl: translation import
2016-03-23 07:23:18 -07:00
Geoff Mendal
2daca7a181
Import translations. DO NOT MERGE
...
Change-Id: I98b04d1538e8c5d6e797f23b2ef195c166cd0a16
Auto-generated-cl: translation import
2016-03-23 07:17:21 -07:00
Michal Karpinski
3bce4bfa04
Remove legacy DeviceLogging methods from DPM
...
Those methods were replaced with SecurityLogging ones.
Bug: 27532425
Change-Id: I6952251d9c15f932517e7cb39a7056f35c3a194f
2016-03-23 13:14:33 +00:00
Chet Haase
bdfe23202d
Merge "Clarify docs around weak references to animator targets" into nyc-dev
...
am: 5084bd6
* commit '5084bd66dd39105f29bf495daabed9af2fdc6979':
Clarify docs around weak references to animator targets
2016-03-23 12:54:42 +00:00
Chet Haase
5084bd66dd
Merge "Clarify docs around weak references to animator targets" into nyc-dev
2016-03-23 12:46:30 +00:00
Geoff Mendal
931eca69f8
Import translations. DO NOT MERGE
...
am: b270fd7 -s ours
* commit 'b270fd7cab9cda19aa4727f06c4a477a4ec12159':
Import translations. DO NOT MERGE
2016-03-23 12:40:51 +00:00
Geoff Mendal
b270fd7cab
Import translations. DO NOT MERGE
...
Change-Id: Ic3ee2457fd2bd3c2f8eba0ff06cf34440420d32f
Auto-generated-cl: translation import
2016-03-23 08:30:50 -04:00
Tomasz Mikolajewski
844f56a8ee
Merge "Revert "Make the accent color darker in DocumentsUI for better accessibility."" into nyc-dev
...
am: 2bd66d6
* commit '2bd66d68d80d1347e731aa0d645e9fddde4abdab':
Revert "Make the accent color darker in DocumentsUI for better accessibility."
2016-03-23 09:55:28 +00:00
Tomasz Mikolajewski
2bd66d68d8
Merge "Revert "Make the accent color darker in DocumentsUI for better accessibility."" into nyc-dev
2016-03-23 09:46:20 +00:00
Diego Perez
5ceb30f216
Add fill type support to vector drawable
...
The platform has added fill type to vector drawables. This CL implements
the native replacement.
Also remove a couple of delegates for classes that have been removed
from the platform.
Change-Id: Ie6ba344db9c9c2c45cd0ef4b99f11f9d8bcfd7de
2016-03-23 09:40:23 +00:00
Daichi Hirono
d2c97082be
Merge "Revert "Make status bar translucent. Make drawer appera below status bar."" into nyc-dev
...
am: b9129be
* commit 'b9129bede266f82089b46af4a4931a42ec9875b2':
Revert "Make status bar translucent. Make drawer appera below status bar."
2016-03-23 08:42:22 +00:00
Daichi Hirono
b9129bede2
Merge "Revert "Make status bar translucent. Make drawer appera below status bar."" into nyc-dev
2016-03-23 08:32:01 +00:00
Daichi Hirono
0574d169ba
Revert "Make status bar translucent. Make drawer appera below status bar."
...
This reverts commit 4639136c3b4bc22064323a193f06d6585e1a171a.
The commit breaks the following CTS tests.
* android.appsecurity.cts.DocumentsTest#testCreateExisting FAIL
* android.appsecurity.cts.DocumentsTest#testCreateNew FAIL
BUG=27805363,27570567
Change-Id: Ic9f1d98714a78afe548eb5ae9afa118ddc83cccc
2016-03-23 17:29:06 +09:00
Daichi Hirono
9103c4650b
Fix the directory item height in grid view.
...
am: c545f5e
* commit 'c545f5e6170edcb7af0e834409c06062e7408778':
Fix the directory item height in grid view.
2016-03-23 07:45:13 +00:00
Daichi Hirono
c545f5e617
Fix the directory item height in grid view.
...
BUG=27565668
Change-Id: I3d5615b46542dcd0f22f5e9968d3ee5bfe1af19a
2016-03-23 16:35:32 +09:00