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

124176 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jeff Brown
baaa080b62 am 90506a41: am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev 
* commit '90506a41c6b85cf7e65b663480e4fe003a99c8c2':
  Add a new "doze mode" based on Dream components.
 2014-02-20 21:49:15 +00:00
Jeff Brown
90506a41c6 am 07e6d1b9: Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev 
* commit '07e6d1b9a5f81ff5a5bf91f2b260ee487d5f2b65':
  Add a new "doze mode" based on Dream components.
 2014-02-20 21:47:08 +00:00
Jeff Brown
07e6d1b9a5 Merge "Add a new "doze mode" based on Dream components." into klp-modular-dev 2014-02-20 21:43:43 +00:00
Jeff Brown
2687550272 Add a new "doze mode" based on Dream components. 
When a doze component has been specified in a config.xml resource
overlay, the power manager will try to start a preconfigured dream
whenever it would have otherwise gone to sleep and turned the
screen off.  The dream should render whatever it intends to show
then call startDozing() to tell the power manager to put the display
into a low power "doze" state and allow the application processor
to be suspended.  The dream may wake up periodically using the
alarm manager or other features to update the contents of the display.

Added several new config.xml resources related to dreams and dozing.
In particular for dozing there are two new resources that pertain to
decoupling auto-suspend mode and interactive mode from the display
state.  This is a requirement to enable the application processor
and other components to be suspended while dozing.  Most devices
do not support these features today.

Consolidated the power manager's NAPPING and DREAMING states into one
to simplify the logic.  The NAPPING state was mostly superfluous
and simply indicated that the power manager should attempt to start
a new dream.  This state is now tracked in the mSandmanSummoned field.

Added a new DOZING state which is analoguous to DREAMING.  The normal
state transition is now: AWAKE -> DREAMING -> DOZING -> ASLEEP.
The PowerManager.goToSleep() method now enters the DOZING state instead
of immediately going to sleep.

While in the doze state, the screen remains on.  However, we actually
tell the rest of the system that the screen is off.  This is somewhat
unfortunate but much of the system makes inappropriate assumptions
about what it means for the screen to be on or off.  In particular,
screen on is usually taken to indicate an interactive state where
the user is present but that's not at all true for dozing (and is
only sometimes true while dreaming).  We will probably need to add
some more precise externally visible states at some point.

The DozeHardware interface encapsulates a generic microcontroller
interface to allow a doze dream for off-loading rendering or other
functions while dozing.  If the device possesses an MCU HAL for dozing
then it is exposed to the DreamService here.

Removed a number of catch blocks in DreamService that caught Throwable
and attempted to cause the dream to finish itself.  We actually just
want to let the process crash.  Cleanup will happen automatically if
needed.  Catching these exceptions results in mysterious undefined
behavior and broken dreams.

Bug: 12494706
Change-Id: Ie78336b37dde7250d1ce65b3d367879e3bfb2b8b
 2014-02-20 13:39:13 -08:00
Narayan Kamath
f9bf991cb5 am bcb433b4: am b1903653: am 128599e4: am 2b3c14bf: Merge "libandroidfw: fix build error for 64-bit" 
* commit 'bcb433b43acb424ff7bc6afab03ce12d8cc9a198':
  libandroidfw: fix build error for 64-bit
 2014-02-20 21:28:09 +00:00
Scott Main
83b6e4b937 am 5ef8d14d: am 72eff55b: am d43ad2f3: am 4c68c4ed: am 24a8e1d0: am af87e19b: Merge "update intent examples for maps bug: 12661490 bug: 12957723" into klp-docs 
* commit '5ef8d14d38654e6309babf46f64f5a296df5c169':
  update intent examples for maps bug: 12661490 bug: 12957723
 2014-02-20 21:27:47 +00:00
John Reck
2f2c0e75af Merge "Fix NPE in layer destruction" 2014-02-20 21:24:29 +00:00
Derek Sollenberger
674554fc36 Reapply "Refactor setting an SkPaint onto a hwui Layer." 
This reverts commit 90d0c75e94a32fb7d993fae69762820aabc2fcbb.

Change-Id: Ie807761231edf7c848b019931dccbf466208c0be
 2014-02-20 16:20:33 -05:00
John Reck
6b3c4113c4 Fix NPE in layer destruction 
Bug: 13111945
 Fixes an issue where a layer is destroyed after the GLRenderer
 lost its Surface. Instead just check that the context we want is
 current regardless of the active surface

Change-Id: I6537e6232b5c667b218b896ed5ef390fbe956344
 2014-02-20 13:18:42 -08:00
Derek Sollenberger
96f0369b25 Merge "Update framework to enable Skia to run in debug mode." 2014-02-20 21:14:50 +00:00
Michael Wright
40c3ddd3a2 Merge "Make deliverInputEvent tracing asynchronous" 2014-02-20 21:07:56 +00:00
Derek Sollenberger
2d5cf4f6db Update framework to enable Skia to run in debug mode. 
Change-Id: I8ba605cfae61b584dad27e3245c4482c8dfdff2e
 2014-02-20 14:47:54 -05:00
Baligh Uddin
17b7705afb 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 'fbb100c437d52db818e6e57c18ffe1e969ba46b0':
  Import translations. DO NOT MERGE
 2014-02-20 18:47:45 +00:00
Baligh Uddin
c87c6a2a46 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 'a69996e45c7c40d971b05a56866b7ac5c7f617de':
  Import translations. DO NOT MERGE
 2014-02-20 18:47:43 +00:00
Baligh Uddin
fbb100c437 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 'ea17c6365fd70b057a4c696d9eec2b5f70b6e476':
  Import translations. DO NOT MERGE
 2014-02-20 18:43:00 +00:00
Baligh Uddin
a69996e45c 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 '701449e85395d7a81d244d4b115b9ef4ae2f06d9':
  Import translations. DO NOT MERGE
 2014-02-20 18:42:58 +00:00
Baligh Uddin
ea17c6365f am 4292ce5d: (-s ours) am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '4292ce5d0023551a6fa7a02b284bf9b02823b06b':
  Import translations. DO NOT MERGE
 2014-02-20 18:39:46 +00:00
Baligh Uddin
701449e853 am c9443fc5: (-s ours) am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c9443fc54caa789c4e3c64e7d9feaee8ac00506f':
  Import translations. DO NOT MERGE
 2014-02-20 18:39:43 +00:00
Deepanshu Gupta
09fcce52b4 Merge "Add ability to obtain themed Drawable from Context" 2014-02-20 18:37:50 +00:00
Baligh Uddin
4292ce5d00 am 810267c3: (-s ours) am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '810267c309f018c5b58b0a2e787b8a6434faa0e0':
  Import translations. DO NOT MERGE
 2014-02-20 18:36:38 +00:00
Baligh Uddin
c9443fc54c am 8ca432c7: (-s ours) am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '8ca432c7828d5d3d00c721b195a4ecb59564bbb7':
  Import translations. DO NOT MERGE
 2014-02-20 18:36:35 +00:00
Baligh Uddin
810267c309 am 28009e81: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '28009e8102aa91294362cc2d7770cab73d02e640':
  Import translations. DO NOT MERGE
 2014-02-20 18:33:18 +00:00
Baligh Uddin
8ca432c782 am c2803d47: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'c2803d473ad180fa70e5000f0607795c92c4035d':
  Import translations. DO NOT MERGE
 2014-02-20 18:33:13 +00:00
Baligh Uddin
28009e8102 Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 18:31:03 +00:00
Baligh Uddin
c2803d473a Merge "Import translations. DO NOT MERGE" into klp-dev 2014-02-20 18:30:49 +00:00
Baligh Uddin
46f1744acf 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 '2f07a7059f4471963c114b0ab944249e8746cbf9':
  Import translations. DO NOT MERGE
 2014-02-20 18:17:41 +00:00
Baligh Uddin
2f07a7059f 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 '50d0afa43af2b215ddddbc7a3adfb8b5d85cb549':
  Import translations. DO NOT MERGE
 2014-02-20 18:13:52 +00:00
Baligh Uddin
e16fe1aa7c 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 '13e850160d21008597239dc974c805df057d4e1b':
  Import translations. DO NOT MERGE
 2014-02-20 18:13:43 +00:00
Baligh Uddin
e9a5424cc6 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 'a935d31ca87146990010121b576506faef803404':
  Import translations. DO NOT MERGE
 2014-02-20 18:13:40 +00:00
Baligh Uddin
54de3ec25b 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 '72edb1b78d0316055b40931138ee75a99766995d':
  Import translations. DO NOT MERGE
 2014-02-20 18:13:38 +00:00
Baligh Uddin
50d0afa43a am 2f5347ee: (-s ours) am 1af20cc5: (-s ours) am 554b43a0: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '2f5347ee46766134848586d67d2dd86bdc9d1952':
  Import translations. DO NOT MERGE
 2014-02-20 18:10:15 +00:00
Baligh Uddin
13e850160d 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 '749e6b9cf21799aefe9accc50c60f6bfddf1545a':
  Import translations. DO NOT MERGE
 2014-02-20 18:09:59 +00:00
Baligh Uddin
a935d31ca8 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 'bf2226ec7f9fcb0a2fc169df170c770363d9a3f5':
  Import translations. DO NOT MERGE
 2014-02-20 18:09:56 +00:00
Baligh Uddin
72edb1b78d 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 '699991c8a296834e8fe843bce85529b018d12af8':
  Import translations. DO NOT MERGE
 2014-02-20 18:09:54 +00:00