drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,415 Commits 1 Branch 0 Tags
Commit Graph

124415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
ec5c3b9040 am c2c0a61c: Add copyright notice to files missing them. 
* commit 'c2c0a61cf5f779b4726f089f28d966c03ccbba54':
  Add copyright notice to files missing them.
 2014-02-21 16:55:55 +00:00
Narayan Kamath
a1aeac80df am 25c55ca9: am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class" 
* commit '25c55ca902f570d3a89753c6eb9492c20dd734ba':
  Remove unused JNITest class
 2014-02-21 16:53:43 +00:00
Narayan Kamath
6191044729 am 7942397b: am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui" 
* commit '7942397b3174a9642996979ae8b4aafb313dc2e2':
  Fixes for 64bit in libhwui
 2014-02-21 16:53:40 +00:00
Narayan Kamath
25c55ca902 am 911b2ce3: am 4a642ee5: Merge "Remove unused JNITest class" 
* commit '911b2ce3da7dbd8b6335d1092fc6c9e880147104':
  Remove unused JNITest class
 2014-02-21 16:47:43 +00:00
Narayan Kamath
7942397b31 am 19256340: am 22c66639: Merge "Fixes for 64bit in libhwui" 
* commit '192563407964926537d688d4098054c3834341c0':
  Fixes for 64bit in libhwui
 2014-02-21 16:47:38 +00:00
Narayan Kamath
911b2ce3da am 4a642ee5: Merge "Remove unused JNITest class" 
* commit '4a642ee5e65ca47ecf6cb274096162e580aac922':
  Remove unused JNITest class
 2014-02-21 08:34:36 -08:00
Narayan Kamath
1925634079 am 22c66639: Merge "Fixes for 64bit in libhwui" 
* commit '22c66639093a634b5688372d261d003b0478c450':
  Fixes for 64bit in libhwui
 2014-02-21 08:34:30 -08:00
Sander Alewijnse
f475ca33d9 Enables a profile owner or device owner to set and clear default intent handler activities. 
Those intent handlers are persistent preferences. They will remain the default intent
handler even if the set of potential event handlers for the intent filter changes
and if the intent preferences are reset.

Change-Id: Id0cfae46f93c10d89e441f272096a205ec518dd0
 2014-02-21 15:24:20 +00:00
Narayan Kamath
4a642ee5e6 Merge "Remove unused JNITest class" 2014-02-21 15:02:31 +00:00
Ashok Bhat
42f06b0e22 Remove unused JNITest class 
JNITest class is no longer actively used. This patch
removes the class (java and jni) files.

JNI interfaces and calls are extensively tested in
the art unit tests (art/tests) and in cts (see
CtsJniTestCases).

Change-Id: I62f7c72deb5d206fa3f545ae39a9cb9011110d0a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
 2014-02-21 14:34:35 +00:00
Narayan Kamath
22c6663909 Merge "Fixes for 64bit in libhwui" 2014-02-21 14:23:57 +00:00
Narayan Kamath
2fb1fa6c88 Merge "AArch64: Make AssetAtlasService 64-bit compatible" 2014-02-21 14:15:44 +00:00
Derek Sollenberger
5238275775 Merge "Reapply "Refactor setting an SkPaint onto a hwui Layer."" 2014-02-21 13:15:33 +00:00
Kévin PETIT
73fc558e44 Fixes for 64bit in libhwui 
Using reinterpret_cast allows conversions between pointer types
and integers which don't have the same size. The corresponding
flags is -Wint-to-pointer-cast.

Change-Id: I8ff0c79d235fa6d07b8d9305edc185d946d5133d
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
 2014-02-21 13:07:29 +00:00
Ashok Bhat
17ab38f8a8 AArch64: Make AssetAtlasService 64-bit compatible 
Changes in this patch include

[x] Long(64-bit) is used to store native pointers in
    AssetAtlasService and related classes as they can be 64-bit.

[x] Some minor changes have been done to conform with
    standard JNI practice (e.g. use of jint instead of int
    in JNI function prototypes)

Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>

(cherry-picked from 4de3f481bc59ab4b766dc027e41aff7cda9d62f7)

Change-Id: If22daf40eef46f8df9f94d65ddcc52c45b3acf2a
 2014-02-21 13:02:34 +00:00
Narayan Kamath
5c79949324 Merge "Make LruCache.resize(int) public" 2014-02-21 12:36:20 +00:00
Craig Mautner
c2c0a61cf5 Add copyright notice to files missing them. 
Fixes bug 13121968.

Change-Id: Ifd86581178e7e98bd72b832020e7c8379d40b2de
 2014-02-20 20:25:41 -08:00
Craig Mautner
e1abfdf711 am 6222a8ef: am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev 
* commit '6222a8ef853609ea9c0f725c2412a2d25968d9da':
  Set the new SurfaceControl opaque flag.
 2014-02-21 04:20:58 +00:00
Craig Mautner
709efec60d am 56dbf7b0: am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev 
* commit '56dbf7b092826b1cef42357bda422baf18d2292c':
  Resize DimLayer explicitly on rotation.
 2014-02-21 04:20:39 +00:00
Guang Zhu
4cd353c038 add new accessibility action for EditText to set text content 
Bug: 12872344
Change-Id: I85a3805ab0c34b96a7d4228f2382c8ff664e36e8
 2014-02-20 20:05:34 -08:00
Michael Wright
d429710f8e Merge "Unbreak manual brightness setting." 2014-02-21 02:09:49 +00:00
Jeff Brown
ac8bdfe4f0 Merge "resolved conflicts for merge of baaa080b to master" 2014-02-21 02:07:45 +00:00
Jeff Brown
10102e4c0e resolved conflicts for merge of baaa080b to master 
Change-Id: I3ee12321e298f7a2ea577a99f30c49f3bb497fae
 2014-02-20 18:05:03 -08:00
Michael Wright
5c977ea1b7 Unbreak manual brightness setting. 
Change-Id: I0ba5b82f60eacd66db0dcf4166e9a919ee06f2e0
 2014-02-20 18:02:27 -08:00
Ben Gruver
0e3b52e5e8 Merge "Add ability to match intents based on the package name of the intent sender" 2014-02-21 01:18:59 +00:00
Matt Casey
59270bffe5 Merge "Add more MediaStore constants for playback intents" 2014-02-21 01:18:24 +00:00
Matt Casey
bd7bcf0fba Add more MediaStore constants for playback intents 
Constants are derived from this doc:
https://docs.google.com/a/google.com/document/d/1lmlFcTeefLDRp_bpMrXk3yK9nKxoTVfpcShanpLxiMg/edit#heading=h.b16863tyyjzv

That doc contains the full explanation of these changes.

I'm making this change on behalf of {elmas,pengr} who don't have
android source access but designed this in collaboration with
rharagutchi on the play music team. I'll probably have to route any
significant questions through them.

Bug: 12874557
Change-Id: I85a4bee57a2bde519da0dc6de2cad9d036da225c
 2014-02-20 17:06:09 -08:00
Alan Viverette
d7a1054b7a Invalidate projection receiver, refactor invalidate methods 
Change-Id: I61bd705abeadbdc6ef611d1c7368cecfd908076f
 2014-02-20 16:10:38 -08:00
Amith Yamasani
1a405db22a Merge "Abort removing account if prohibited by policy" 2014-02-21 00:06:03 +00:00
Amith Yamasani
5934dbc9f1 Abort removing account if prohibited by policy 
Bug: 13077993

If an EDU device was marked as prohibited from adding/removing accounts, it was throwing
an error but still continuing to remove the account. This fixes the problem by aborting
the removeAccount steps.

Change-Id: Ie7f157c5397a7391aab6f37c8a4331479f1b451b
 2014-02-20 15:23:36 -08:00
Baligh Uddin
949131b660 am 17b7705a: (-s ours) am fbb100c4: (-s ours) am ea17c636: (-s ours) am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '17b7705afb3e36a6239fdcc3fadfa6601f32fe98':
  Import translations. DO NOT MERGE
 2014-02-20 23:02:09 +00:00
Baligh Uddin
d87e57f698 am c87c6a2a: (-s ours) am a69996e4: (-s ours) am 701449e8: (-s ours) am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c87c6a2a4630e53d8dc07eb53095776fa31c463f':
  Import translations. DO NOT MERGE
 2014-02-20 23:02:06 +00:00
Baligh Uddin
983f053f46 am 46f1744a: (-s ours) am 2f07a705: (-s ours) am 50d0afa4: (-s ours) am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '46f1744acf7bd795ac80ed10a5b6bd3f03682b46':
  Import translations. DO NOT MERGE
 2014-02-20 23:01:47 +00:00
Baligh Uddin
c038cd95b9 am e16fe1aa: (-s ours) am 13e85016: (-s ours) am 749e6b9c: (-s ours) am 5da96060: (-s ours) am f887a67d: (-s ours) am aa20b274: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e16fe1aa7cd332ddf09d25ae2fee43d6c5cb884a':
  Import translations. DO NOT MERGE
 2014-02-20 23:01:43 +00:00
Baligh Uddin
7278142660 am e9a5424c: (-s ours) am a935d31c: (-s ours) am bf2226ec: (-s ours) am 8b297fb6: (-s ours) am 8027100f: (-s ours) am e9adafd1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'e9a5424cc64e44812383ab9e417f18b8a1f647d1':
  Import translations. DO NOT MERGE
 2014-02-20 23:01:39 +00:00
Baligh Uddin
f8ecdd0c72 am 54de3ec2: (-s ours) am 72edb1b7: (-s ours) am 699991c8: (-s ours) am 08394af2: (-s ours) am e69b7b34: (-s ours) am 46a02249: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '54de3ec25b309f51f4a05438fd0089d713cd5309':
  Import translations. DO NOT MERGE
 2014-02-20 23:01:37 +00:00
Xavier Ducrohet
92d5a67d1b am 7d236199: (-s ours) am 21c5c8e6: am 9edf7a11: am 2cb9147f: am 55542ee6: am 3e637042: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into klp-dev 
* commit '7d23619918eab43e6a54d9f780a0610e6e237ec3':
  Set default text style in layoutlib as NORMAL [DO NOT MERGE]
 2014-02-20 23:01:33 +00:00
Deepanshu Gupta
62b6062652 am 7b5d0a82: (-s ours) am c139177b: am 65521c3c: am ca4b9a77: am e92c8542: am 01825b7a: Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE] 
* commit '7b5d0a82f65ff83d0c360f47d7506ee22a7b7941':
  Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
 2014-02-20 23:01:30 +00:00
Justin Koh
0be0a5039b am 7206ac56: am a79ac472: am 744d3473: Merge "Add hardware feature describing a watch." into klp-modular-dev 
* commit '7206ac561291298f08809614be95963966a72ca8':
  Add hardware feature describing a watch.
 2014-02-20 23:01:25 +00:00
Craig Mautner
6222a8ef85 am 1648f042: am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev 
* commit '1648f042f31df54c25a725c4c5ca2c852a10ef0e':
  Set the new SurfaceControl opaque flag.
 2014-02-20 22:42:59 +00:00
Craig Mautner
56dbf7b092 am 3519530f: am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev 
* commit '3519530fae3584c74db294ab11814f94b966d419':
  Resize DimLayer explicitly on rotation.
 2014-02-20 22:42:56 +00:00
Craig Mautner
1648f042f3 am fd8a8ccb: Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev 
* commit 'fd8a8ccbb79b3d83bb328d64c544c59251eef151':
  Set the new SurfaceControl opaque flag.
 2014-02-20 22:39:52 +00:00
Craig Mautner
3519530fae am 267b37ce: Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev 
* commit '267b37ceff64b6adaeef52e3a582f1186144f93e':
  Resize DimLayer explicitly on rotation.
 2014-02-20 22:39:49 +00:00
Craig Mautner
fd8a8ccbb7 Merge "Set the new SurfaceControl opaque flag." into klp-modular-dev 2014-02-20 22:36:52 +00:00
Craig Mautner
267b37ceff Merge "Resize DimLayer explicitly on rotation." into klp-modular-dev 2014-02-20 22:34:38 +00:00
Craig Mautner
902945d151 Resize DimLayer explicitly on rotation. 
Using the alpha value to trigger a resizing of the DimLayer was a
Bad Idea. The alpha value should reflect the true alpha value and
not be used to trick the code. Actually changing the size and
position is a Better Idea.

Fixes bug 13101776.

Change-Id: I11c16b8276919ea85960fe87bb17c0956ce8a3b1
 2014-02-20 14:31:32 -08:00
Alan Viverette
d85e7840b0 Merge "Fix density in touch feedback drawable" 2014-02-20 22:03:55 +00:00
Alan Viverette
cb29189c29 Fix density in touch feedback drawable 
Change-Id: I90b08aea9f5ba0a29ae5328960bacebc6c2099d8
 2014-02-20 14:03:27 -08:00
Narayan Kamath
a50d7cf2d5 am 66e30b35: am c95ed621: am fca204a4: am 05cebdc2: Merge "Fix several bad function definitions." 
* commit '66e30b357dd105246430d552f4cf4a7cff665abb':
  Fix several bad function definitions.
 2014-02-20 21:58:04 +00:00
Narayan Kamath
3fa48a2063 am fb7b3181: (-s ours) am 520a5673: am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible" 
* commit 'fb7b3181fc291b17f4376d1163edd32c4fb8cca7':
  AArch64: Make AssetAtlasService 64-bit compatible
 2014-02-20 21:58:02 +00:00