Jason Sams
ece85f3b04
am 840b5069: Merge "Support typed YUV allocations."
...
* commit '840b5069707c6f39ec06231dacbcbe8159d581c1':
Support typed YUV allocations.
2013-02-15 18:59:22 -08:00
Jason Sams
840b506970
Merge "Support typed YUV allocations."
2013-02-16 02:54:22 +00:00
Tim Murray
5db25eda73
am ab7a2919: Merge "Add MIRRORED_REPEAT."
...
* commit 'ab7a2919a321af21b234d8db14748624c1b13634':
Add MIRRORED_REPEAT.
2013-02-15 18:15:40 -08:00
Tim Murray
ab7a2919a3
Merge "Add MIRRORED_REPEAT."
2013-02-16 02:11:32 +00:00
Chris Craik
225e8943de
am 857089eb: Merge "Adjust offset for non-AA line drawing"
...
* commit '857089eb1efcc7d86f373edf8cb30911a95f6bac':
Adjust offset for non-AA line drawing
2013-02-15 18:11:13 -08:00
Chris Craik
857089eb1e
Merge "Adjust offset for non-AA line drawing"
2013-02-16 02:09:22 +00:00
Jason Sams
dd6c8b34f1
Support typed YUV allocations.
...
Change-Id: I56e7a318dc979f0b7454fcfa5773ea6d95bbaeaa
2013-02-15 17:27:24 -08:00
Jeff Sharkey
be72215c39
Better API for low disk space warnings.
...
Provides uniform interface to ask about low disk thresholds; can
be mocked by other tests. Opens door to adjust thresholds based on
disk type.
Switch monitor service to using new API, and use filesystem paths
from Environment instead of hard-coding.
Change-Id: Ifdb536e36a453f1b67bc65849037ec3cc0232cf2
2013-02-15 16:59:55 -08:00
Mathias Agopian
4078559a1f
am 8d1a6af4: Merge "fix typo introduced in SurfaceTextureClient to Surface renaming"
...
* commit '8d1a6af408d798dec46a8b1230b7327551fb8051':
fix typo introduced in SurfaceTextureClient to Surface renaming
2013-02-15 16:40:42 -08:00
Mathias Agopian
8d1a6af408
Merge "fix typo introduced in SurfaceTextureClient to Surface renaming"
2013-02-16 00:37:38 +00:00
Mathias Agopian
f798a8e8d4
fix typo introduced in SurfaceTextureClient to Surface renaming
...
Change-Id: Iaf1ecc9f5b83a029067b278bc15180d68a113587
2013-02-15 16:35:21 -08:00
Irfan Sheriff
41a88027f1
am b21a30db: am 05913cc9: (-s ours) am c6ea41ef: Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
...
* commit 'b21a30dbc28fd5fc25ae89fbae7542d77546da50':
Fix broken test.
Track keys per config and allow cert push from apps
eix enterprise config storage bugs
Fix connectivitymanagertest
Fix build
Refactor enterprise config
2013-02-15 16:22:21 -08:00
Irfan Sheriff
b21a30dbc2
am 05913cc9: (-s ours) am c6ea41ef: Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
...
* commit '05913cc97915f04d0c75ce6a39282628570e90ff':
Fix broken test.
Track keys per config and allow cert push from apps
eix enterprise config storage bugs
Fix connectivitymanagertest
Fix build
Refactor enterprise config
2013-02-15 16:18:50 -08:00
Laurent Tu
34ab0a4a18
am 7c93839d: Revert "Tentative fix for aidl import issue"
...
* commit '7c93839d7b41727c11925b034d4ec84491d3dee1':
Revert "Tentative fix for aidl import issue"
2013-02-15 16:11:26 -08:00
Laurent Tu
7c93839d7b
Revert "Tentative fix for aidl import issue"
...
Fix build.
This reverts commit 4f115e08cb68aaf77693f3f4598f0eb5f7634777.
Change-Id: Ic4f51e3492f54afec5f0eeb48e08491eb47f3c04
2013-02-15 16:07:56 -08:00
Irfan Sheriff
05913cc979
am c6ea41ef: Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
...
* commit 'c6ea41efc93df12eeef7c59124bee83e8f3f7a41':
Fix broken test.
Track keys per config and allow cert push from apps
eix enterprise config storage bugs
Fix connectivitymanagertest
Fix build
Refactor enterprise config
2013-02-15 15:55:43 -08:00
Irfan Sheriff
c6ea41efc9
Merge changes I8c5649c9,I79b43bf7,I83a01690,If5687eac,Ib9fd57c6,I7104250e
...
* changes:
Fix broken test.
Track keys per config and allow cert push from apps
eix enterprise config storage bugs
Fix connectivitymanagertest
Fix build
Refactor enterprise config
2013-02-15 23:42:28 +00:00
Svetoslav
8cf1921fc0
am 7f84ed31: Merge "Dynamically configurable accessibility flags mishandled."
...
* commit '7f84ed31f01997d4906e408c335f783a91d197d5':
Dynamically configurable accessibility flags mishandled.
2013-02-15 15:29:25 -08:00
Svetoslav
7f84ed31f0
Merge "Dynamically configurable accessibility flags mishandled."
2013-02-15 23:26:59 +00:00
Svetoslav
9e065121fa
Dynamically configurable accessibility flags mishandled.
...
A bug was preventing clearing dynamically settable accessibility
service flags.
bug:8051095
Change-Id: I6844b2f44e323bc741ac39983a892f1d28f3132b
2013-02-15 15:24:13 -08:00
Wink Saville
1c2acdc6e8
Fix broken test.
...
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
2013-02-15 15:20:37 -08:00
Irfan Sheriff
b815edf3ab
Track keys per config and allow cert push from apps
...
Allow configuring keys for a configuration and update/delete
from wificonfigstore.
Change-Id: I79b43bf7ca58f7efc95f7dcc125fc84d7aa8c795
2013-02-15 15:19:35 -08:00
Laurent Tu
1662cf99b6
am 8acb27c5: Merge "Tentative fix for aidl import issue"
...
* commit '8acb27c505c610b4027ec3d140ccc7722ab4faa3':
Tentative fix for aidl import issue
2013-02-15 15:19:22 -08:00
Laurent Tu
8acb27c505
Merge "Tentative fix for aidl import issue"
2013-02-15 23:16:08 +00:00
Dirk Dougherty
9002ffeb97
am 156a2fc6: am 5fce0c1f: am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights.
...
* commit '156a2fc65a2b493a73fa1031f54664a8086c5f4e':
Doc change: Edits for RTL in highlights.
2013-02-15 15:13:38 -08:00
Dirk Dougherty
156a2fc65a
am 5fce0c1f: am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights.
...
* commit '5fce0c1fe3352ae7c69dc67be1ff84425e11455a':
Doc change: Edits for RTL in highlights.
2013-02-15 15:12:37 -08:00
Dirk Dougherty
5fce0c1fe3
am e91b0533: am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights.
...
* commit 'e91b053369638f81e725a47a7491853b06aca5ae':
Doc change: Edits for RTL in highlights.
2013-02-15 15:11:25 -08:00
Dirk Dougherty
e91b053369
am ed0c6fe6: am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights.
...
* commit 'ed0c6fe66ce836431ba999cb79fa0d1441e21997':
Doc change: Edits for RTL in highlights.
2013-02-15 15:08:33 -08:00
Dirk Dougherty
ed0c6fe66c
am 531375f9: am 34434bad: Doc change: Edits for RTL in highlights.
...
* commit '531375f9bdca84a34a0ca5bdba34f44f0b34ed50':
Doc change: Edits for RTL in highlights.
2013-02-15 15:06:00 -08:00
Dirk Dougherty
531375f9bd
am 34434bad: Doc change: Edits for RTL in highlights.
...
* commit '34434badf6ca2fd04c088e2971d33ded39158d22':
Doc change: Edits for RTL in highlights.
2013-02-15 15:03:37 -08:00
Dirk Dougherty
34434badf6
Doc change: Edits for RTL in highlights.
...
Change-Id: I4a01bbcaa1470dce571295a9e5e035a395c28c1a
2013-02-15 15:00:43 -08:00
Irfan Sheriff
b07526fb1c
eix enterprise config storage bugs
...
Reading empty and not updating was resulting in retaining old values
in a config. Also, fix matching phase2 entries.
Additionally, allow configuring subset of enterprise fields. Necessary
since password cannot be read back from supplicant.
Change-Id: I83a01690a0cf7cad1457a674f50f1e3a1a0441b5
2013-02-15 14:58:15 -08:00
Irfan Sheriff
46e0931080
Fix connectivitymanagertest
...
Change-Id: If5687eacec0f502c39b102eb5cf7d9383f0ec056
2013-02-15 14:55:15 -08:00
Chris Craik
62a42c13a6
Adjust offset for non-AA line drawing
...
bug:8114304
The original .375 was chosen to make GL_LINES align with Skia drawing.
The new value of .065 is chosen to be as small as possible to make
triangle-based lines align with Skia, while keeping lines drawn on
integer coordinates unambiguous as to which column/row they draw on.
Also adds more lines in CanvasCompare test to highlight the difference
Change-Id: If578684f2db320682219c3caa625cf79bc62d88f
2013-02-15 14:53:12 -08:00
Tim Murray
6b9b2caf2b
Add MIRRORED_REPEAT.
...
Change-Id: I7565da24912a3c33d8f824da9ea0899a423d3c40
2013-02-15 14:53:09 -08:00
Irfan Sheriff
2f6778c038
Fix build
...
Change-Id: Ib9fd57c641e3bd2001c7c802f35d97e0cb849b8a
2013-02-15 14:52:33 -08:00
Irfan Sheriff
c72c5625c6
Refactor enterprise config
...
Change-Id: I7104250e80317fce6164385701a7caffbcd14813
2013-02-15 14:51:19 -08:00
Baligh Uddin
d2f4998aa5
am e1fbc6d7: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit 'e1fbc6d7fb2ab0d5e9488adb426813d316e17789':
Import translations. DO NOT MERGE
2013-02-15 14:49:52 -08:00
Baligh Uddin
e1fbc6d7fb
Merge "Import translations. DO NOT MERGE"
2013-02-15 22:43:35 +00:00
Baligh Uddin
2af2cdeb4f
Merge branch 'master-chromium' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into master-chromium
2013-02-15 14:43:09 -08:00
Baligh Uddin
36efbea8dd
am 21741f87: (-s ours) Merge "Import translations. DO NOT MERGE"
...
* commit '21741f8734f35b9089fbb53b329971837d331274':
Import translations. DO NOT MERGE
2013-02-15 14:43:05 -08:00
Baligh Uddin
1234a8b6c1
Merge "Import translations. DO NOT MERGE" into master-chromium
2013-02-15 22:41:31 +00:00
Baligh Uddin
21741f8734
Merge "Import translations. DO NOT MERGE"
2013-02-15 22:39:22 +00:00
Mathias Agopian
76f56dd598
am ceec31b7: Merge changes I5a218ca1,I853a76d9
...
* commit 'ceec31b7dab6a23e443d5dcbcfac4a23b720cfde':
Refactoring: Rename SurfaceTextureClient to Surface
clean-up following Surface split
2013-02-15 14:28:22 -08:00
Romain Guy
df93fdb6c0
am aa8307b9: Merge "Remove obsolete header file"
...
* commit 'aa8307b991b9fca5403b5d7f43659b92527af4fd':
Remove obsolete header file
2013-02-15 14:28:19 -08:00
Mathias Agopian
ceec31b7da
Merge changes I5a218ca1,I853a76d9
...
* changes:
Refactoring: Rename SurfaceTextureClient to Surface
clean-up following Surface split
2013-02-15 22:08:40 +00:00
Romain Guy
aa8307b991
Merge "Remove obsolete header file"
2013-02-15 21:58:29 +00:00
Baligh Uddin
4cf32d2e9f
Import translations. DO NOT MERGE
...
Change-Id: I12eb67341bf7801d996bfaef6ede235dbb3daecd
Auto-generated-cl: translation import
2013-02-15 13:43:45 -08:00
Baligh Uddin
605e962d8e
Import translations. DO NOT MERGE
...
Change-Id: I78574a679d2a22599bc131019a9e2049fb499634
Auto-generated-cl: translation import
2013-02-15 13:39:10 -08:00
Baligh Uddin
570bf48d4a
Import translations. DO NOT MERGE
...
Change-Id: Id6fd43d678aa4013c8d8214ac9b6b66de3982d69
Auto-generated-cl: translation import
2013-02-15 13:37:31 -08:00