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

125504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
be727079a5 Merge "Set default text style in layoutlib as NORMAL" 2014-02-19 20:16:09 +00:00
Deepanshu Gupta
d3f8e8709e Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib." 2014-02-19 20:15:53 +00:00
Baligh Uddin
74b51c86a4 Import translations. DO NOT MERGE 
Change-Id: Ie210515c79f6745c99c98e7db2df9026c7a9b9b3
Auto-generated-cl: translation import
 2014-02-19 12:06:50 -08:00
Baligh Uddin
ea2b464213 Import translations. DO NOT MERGE 
Change-Id: If71739ff335132909a32b35fcaee892a49191f54
Auto-generated-cl: translation import
 2014-02-19 11:56:44 -08:00
Adam Lesinski
e08748faa2 am a78068e7: am 13c83996: am 1c532c2e: am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev 
* commit 'a78068e7a3af53cc2b590902f74074d1781513da':
  Make UsbService optional
 2014-02-19 11:50:14 -08:00
Adam Lesinski
e0b8f6251e am 55b8ddc3: am 0817d16c: am 04520a01: am 6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev 
* commit '55b8ddc30386ec15073304b1f9fabc7eb789f52e':
  Add fastpath for single signature comparison
 2014-02-19 11:50:11 -08:00
Adam Lesinski
a78068e7a3 am 13c83996: am 1c532c2e: am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev 
* commit '13c839962e246517a7a95326610ea30c529d79dc':
  Make UsbService optional
 2014-02-19 19:48:05 +00:00
Adam Lesinski
55b8ddc303 am 0817d16c: am 04520a01: am 6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev 
* commit '0817d16c539ca6b499da9f807e8ac6988233e9c3':
  Add fastpath for single signature comparison
 2014-02-19 19:48:01 +00:00
Adam Lesinski
13c839962e am 1c532c2e: am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev 
* commit '1c532c2e2d8464ef7ddd0cc5914f3b1ab2dc49c2':
  Make UsbService optional
 2014-02-19 19:44:19 +00:00
Adam Lesinski
0817d16c53 am 04520a01: am 6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev 
* commit '04520a01b8469729379e73a7995a188ffea2b187':
  Add fastpath for single signature comparison
 2014-02-19 19:44:17 +00:00
Ruben Brunk
fe618ac4ea am 83efaff8: Fixbuild: update API for whitebalance. 
* commit '83efaff8c499bf9eb5c0c2b51472b4db9ca831f1':
  Fixbuild: update API for whitebalance.
 2014-02-19 11:43:39 -08:00
Adam Lesinski
1c532c2e2d am 4b07b26e: Merge "Make UsbService optional" into klp-modular-dev 
* commit '4b07b26e8654df52ca80bb2165ebdf9352ab9337':
  Make UsbService optional
 2014-02-19 19:41:26 +00:00
Adam Lesinski
04520a01b8 am 6feaa267: Merge "Add fastpath for single signature comparison" into klp-modular-dev 
* commit '6feaa267a585f22595f846c9e3d09a76dc3db47a':
  Add fastpath for single signature comparison
 2014-02-19 19:41:23 +00:00
Ruben Brunk
83efaff8c4 Fixbuild: update API for whitebalance. 
Change-Id: If5189b60325fb01a4dae666ef01193334a3b5428
 2014-02-19 11:39:20 -08:00
Adam Lesinski
4b07b26e86 Merge "Make UsbService optional" into klp-modular-dev 2014-02-19 19:38:34 +00:00
Adam Lesinski
6feaa267a5 Merge "Add fastpath for single signature comparison" into klp-modular-dev 2014-02-19 19:38:17 +00:00
Ruben Brunk
1dac456eec am 844aa619: Merge "camera3: Update whiteLevel tag." 
* commit '844aa619607894124ab05c93780dba091394b2a5':
  camera3: Update whiteLevel tag.
 2014-02-19 11:34:05 -08:00
Ruben Brunk
844aa61960 Merge "camera3: Update whiteLevel tag." 2014-02-19 19:31:57 +00:00
Alan Viverette
eed98a2147 am 5314b3d5: Merge "Fix alert dialog\'s background when no custom panel visible" 
* commit '5314b3d593a04c67d12dc134e9e80aa41c8e7042':
  Fix alert dialog's background when no custom panel visible
 2014-02-19 11:21:40 -08:00
Alan Viverette
5314b3d593 Merge "Fix alert dialog's background when no custom panel visible" 2014-02-19 19:19:11 +00:00
Andy McFadden
822b02bd9b am bfc3f21a: Merge "Hide three malformed GL bindings" 
* commit 'bfc3f21a1b48e2eb76a08cb6a616d60e0bfcad58':
  Hide three malformed GL bindings
 2014-02-19 11:18:17 -08:00
Andy McFadden
bfc3f21a1b Merge "Hide three malformed GL bindings" 2014-02-19 19:15:01 +00:00
John Reck
e022b60d96 am 5efe5a2d: Merge "Support HardwareLayers in RenderThread" 
* commit '5efe5a2d35604595913c9e372c904b85c32e71c8':
  Support HardwareLayers in RenderThread
 2014-02-19 11:12:50 -08:00
Dianne Hackborn
362d2718ab am b3f38c63: Merge "Fix issue #13095629: Device is in restart mode for long time..." 
* commit 'b3f38c6398d7f493ee50656a8728acee2c0671f6':
  Fix issue #13095629: Device is in restart mode for long time...
 2014-02-19 11:12:47 -08:00
Chris Craik
0f750eb306 am 66d792b6: Merge "Make outline and shadow APIs public" 
* commit '66d792b6631a8dfd0dd0b7abc75077760fa083cc':
  Make outline and shadow APIs public
 2014-02-19 11:12:43 -08:00
Deepanshu Gupta
0acfb16dcd Set default text style in layoutlib as NORMAL 
If a style doesn't specify text style (normal/bold/italic/bold-italic)
then default to normal instead of throwing an error.

Bug: http://b.android.com/61358
Change-Id: I0138c73807a5ff6e4d938a99ece3044333110aa1
 2014-02-19 11:05:02 -08:00
John Reck
5efe5a2d35 Merge "Support HardwareLayers in RenderThread" 2014-02-19 18:58:18 +00:00
Dianne Hackborn
b3f38c6398 Merge "Fix issue #13095629: Device is in restart mode for long time..." 2014-02-19 18:57:50 +00:00
Deepanshu Gupta
e327212add Fix sans-serif-thin and sans-serif-light fonts in layoutlib. 
For these font families, text was always rendered as italic. This
changeset fixes the issue.

Bug: http://b.android.com/57221
Change-Id: Ic8a299bd1e555f5bb914cd3d2fe72917ec7f471a
 2014-02-19 10:53:27 -08:00
Dianne Hackborn
00e2521d2a Fix issue #13095629: Device is in restart mode for long time... 
...during taking OTA

Add some sanity checks.

Change-Id: I6bec1b8d8443c4b3c2a706635acf89c8e5051428
 2014-02-19 10:49:24 -08:00
John Reck
19b6bcfd83 Support HardwareLayers in RenderThread 
Also has a few HardwareLayer lifecycle fixes

Change-Id: I6308cb05f8f199eed72189ace768013a46815941
 2014-02-19 10:47:19 -08:00
Andy McFadden
9ba6ecb275 Hide three malformed GL bindings 
They were replaced with correct bindings a while back, but the
broken methods weren't hidden.

Bug 6006380

Change-Id: I3432d37a6bf411bbd2b3ea363749e32fcff28672
 2014-02-19 10:34:54 -08:00
Sailesh Nepal
d309d5f602 Merge commit 'a269eca8' into manualmerge 2014-02-19 10:18:07 -08:00
Chris Craik
66d792b663 Merge "Make outline and shadow APIs public" 2014-02-19 18:11:46 +00:00
Sailesh Nepal
a269eca846 Merge "Delete Third Party Call APIs" 2014-02-19 18:08:59 +00:00
Craig Mautner
1f9820f011 am 08c9db73: am 6ed1c96b: am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '08c9db7363a45e2e86f3f69f52758c37775cea7e':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 08:39:34 -08:00
Narayan Kamath
563d7fad39 am dfc1ef92: am 29596ac2: am 41dd75f8: am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit 'dfc1ef92557be5565469a2fc8b075f46dc3b4948':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 08:39:32 -08:00
Craig Mautner
08c9db7363 am 6ed1c96b: am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '6ed1c96b7253d2590ffe339714bdcaf8c77217c0':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 16:37:07 +00:00
Narayan Kamath
dfc1ef9255 am 29596ac2: am 41dd75f8: am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '29596ac2baef37de4cfed494cd740de8d1090899':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 16:37:03 +00:00
Craig Mautner
6ed1c96b72 am a1baf028: am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit 'a1baf0288407c17737cf92bba5c7fccb8c8c55ed':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 16:34:03 +00:00
Narayan Kamath
29596ac2ba am 41dd75f8: am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '41dd75f8135cd50ba2d38690ce8b05f30964f6e7':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 16:34:01 +00:00
Craig Mautner
a1baf02884 am 23ef1b5e: am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '23ef1b5e0b84e3bb726454b97846f91f2efad212':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 16:29:01 +00:00
Narayan Kamath
41dd75f813 am 96ddea41: am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '96ddea413dcf266d996877d3fc2d81738c5316c8':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 16:28:56 +00:00
Craig Mautner
23ef1b5e0b am 16ea3e6a: Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 
* commit '16ea3e6a5b37dc436d1089996004bcae12f5e3b0':
  A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one.
 2014-02-19 08:26:15 -08:00
Narayan Kamath
96ddea413d am 7c710936: Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 
* commit '7c710936c5129664f8b23bf4592c12eca975d229':
  Remove java.io.tmpdir assignment in AndroidRuntime.
 2014-02-19 08:26:07 -08:00
John Spurlock
65d84b1da3 am ed0cd0c3: Merge "Don\'t call back into AM to get current user." 
* commit 'ed0cd0c38d234a61b7c20ef434ff0449edf98304':
  Don't call back into AM to get current user.
 2014-02-19 08:21:08 -08:00
John Spurlock
ed0cd0c38d Merge "Don't call back into AM to get current user." 2014-02-19 16:17:31 +00:00
Craig Mautner
16ea3e6a5b Merge "A background started service is removed from mStartingBackground when timeout. Fix is to make sure mStartingBackground is updated to remove one." 2014-02-19 15:36:01 +00:00
John Spurlock
4355a533bc Don't call back into AM to get current user. 
Bug:13079471
Change-Id: I733d6e3c41c91008406261eac827e6b65bb400db
 2014-02-19 09:49:25 -05:00
Narayan Kamath
7c710936c5 Merge "Remove java.io.tmpdir assignment in AndroidRuntime." 2014-02-19 14:24:48 +00:00