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

135482 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
c251147a2b am 85ec1445: am f266873c: am 1c55797d: Fix build 
* commit '85ec144538de6c27b22dff1bd45491a334f626ef':
  Fix build
 2014-05-13 23:50:44 +00:00
Deepanshu Gupta
9ca7a039f7 resolved conflicts for merge of e0be42a9 to jb-mr1.1-dev 2014-05-13 16:48:31 -07:00
Deepanshu Gupta
85ec144538 am f266873c: am 1c55797d: Fix build 
* commit 'f266873c8059e78410bf43c83fb8f0fd5bfe3362':
  Fix build
 2014-05-13 23:45:30 +00:00
Deepanshu Gupta
e0be42a9f9 am 40bfb60e: Fix build due to incorrect merges [DO NOT MERGE] 
* commit '40bfb60efa0e92259a417a5cbfd6095759c678b7':
  Fix build due to incorrect merges [DO NOT MERGE]
 2014-05-13 23:40:37 +00:00
Deepanshu Gupta
f266873c80 am 1c55797d: Fix build 
* commit '1c55797d0e786b6594e769c2fa424e1b8386648e':
  Fix build
 2014-05-13 23:40:34 +00:00
George Mount
11d0415481 Merge "Check for null Drawable in MoveImage" 2014-05-13 23:31:09 +00:00
Justin Koh
32c5f2998f am 78b94de4: Set KITKAT_WATCH to be level 20, document API specific changes. 
* commit '78b94de4b527c26bb3c038ae4f8cc351b3b4881f':
  Set KITKAT_WATCH to be level 20, document API specific changes.
 2014-05-13 23:24:33 +00:00
Victoria Lease
a08f0f8f45 update noto fonts 
This commit represents a mass update of the Noto Fonts project, including
support for a number of new scripts, and a number of fonts being moved from
Droid to Noto versions.

Change-Id: I163076c2c2e622520c016d2086d59efe2cf464f3
 2014-05-13 16:11:11 -07:00
Paul Jensen
3e32a4b667 Add Network-specific host name resolution API. 
Change-Id: I932f73158a8f6e3ccc36c319d138180dff2aa070
 2014-05-13 19:05:13 -04:00
Justin Koh
78b94de4b5 Set KITKAT_WATCH to be level 20, document API specific changes. 
Bug: 14116162
Change-Id: Iab094dbd0add414a365234c275bd473787b8803b
 2014-05-13 16:03:18 -07:00
Deepanshu Gupta
40bfb60efa Fix build due to incorrect merges [DO NOT MERGE] 
Change-Id: Ib3b4dafeed6ba4c07450d13d9908fb05a1a4542f
 2014-05-13 15:52:39 -07:00
Justin Koh
597f1b8481 am 72a4c15c: (-s ours) am 5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev 
* commit '72a4c15c49332965251315901f44905a66653adc':
  Hide new methods in notificationlistenerservice DO NOT MERGE
 2014-05-13 22:50:46 +00:00
Deepanshu Gupta
1c55797d0e Fix build 
remove a line that shouldn't have been merged into this branch.

The build will still be broken for this branch, but this will fix it for
many branches downstream.

Change-Id: I2f556636640eb823dc2834afae7b536e79b79607
 2014-05-13 15:47:04 -07:00
Justin Koh
72a4c15c49 am 5e6b8d37: Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev 
* commit '5e6b8d37cfdf6849890c730045f01ca5a0b4b8e8':
  Hide new methods in notificationlistenerservice DO NOT MERGE
 2014-05-13 22:45:50 +00:00
John Spurlock
10817fbf38 Merge "New quick settings implementation." 2014-05-13 22:45:42 +00:00
John Spurlock
af8d6c44f0 New quick settings implementation. 
Bug:14133785
Change-Id: I7f57f8e7ebcc3e1a06fa5204f477470f14299e1f
 2014-05-13 18:43:40 -04:00
Justin Koh
5e6b8d37cf Merge "Hide new methods in notificationlistenerservice DO NOT MERGE" into klp-modular-dev 2014-05-13 22:42:46 +00:00
Michael Wright
973efa0813 Only translate prefixed strings to keys / axes. 
In order to maintain compatibility, we need to only translate strings
prefixed with KEYCODE_ or AXIS_ into the appropriate key codes /
axes. Otherwise things like `adb shell input` will convert 4 into
KEYCODE_4 whereas before it would convert it into KEYCODE_BACK.

Bug: 14807833
Change-Id: I2cb41aa55dbb2e3fd62664c1b944877290d7e4be
 2014-05-13 15:38:56 -07:00
Igor Murashkin
3c40a046cf camera2: Update native<->managed camera metadata marshalers 
* Improve existing marshalers:
 - each managed/native type combination can be queried marshal support
 - marshalers can recursively call other marshalers for nested types
 - support marshaling/unmarshaling generic classes by using super type tokens

* Add new marshalers for:
 - ColorSpaceTransform
 - MeteringRectangle
 - Parcelable
 - Range<T>
 - ReprocessFormatsMap
 - RggbChannelVector
 - SizeF
 - StreamConfiguration
 - StreamConfigurationDuration

Batteries included; so are unit tests.

Bug: 14628001
Change-Id: I38d3e646ccfb3953898cd6f750c33e4097328482
 2014-05-13 15:28:24 -07:00
Michael Wright
957d620267 Remove reflection from InputEventConsistencyVerifier ctor. 
InputEventConsistencyVerifier can be instantiated during
performTraversals, so we should probably not perform reflection when
it isn't necessary.

Bug: 14899726
Change-Id: Ia722fdc2de469b1ea6463c6523e18a85ddfbc110
 2014-05-13 15:11:58 -07:00
Justin Koh
e98122ed5d Hide new methods in notificationlistenerservice DO NOT MERGE 
Hide new methods in notificationlistenerservice for now.
Bug: 14116162

Change-Id: Ib57fd2feff174ab8638bd172710873e9e2be553a
 2014-05-13 15:10:16 -07:00
John Reck
bee74c2b47 Merge "Clamp to uint8 for alpha" 2014-05-13 21:59:36 +00:00
John Reck
191437447a Merge "Wire up texture atlas" 2014-05-13 21:59:31 +00:00
John Reck
66f0be65a1 Wire up texture atlas 
Bug: 14590563

Change-Id: I2dffbc089dc801f5fb2d1c8fd38e1c71d160e110
 2014-05-13 14:54:42 -07:00
Deepanshu Gupta
cdbd990698 am dcf080d5: am 56a794f2: am 96e30774: am fea4b4dd: am 3450dc32: am 06018d92: am f41a380b: am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit 'dcf080d571e9b40266a961ddd1a421efecdded1a':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 21:43:58 +00:00
Deepanshu Gupta
e3950823b6 am 465a9926: am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '465a99260ea1d868e9aa43d08e63cb85892f188e':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:43:52 +00:00
Deepanshu Gupta
004bfbd36a am 83dcd3f9: am bda6d9a1: am 9a3e6ec7: am cdc40eb0: am 6fd1703e: (-s ours) am 0d33f604: am 4dff881b: am 7b9cc710: (-s ours) am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO N 
* commit '83dcd3f97fd2b48c8a6625fd596bdf577c22f390':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 21:43:49 +00:00
Deepanshu Gupta
494a7fcd18 am 55f0c874: am 5f421714: am 03ccc80d: am c909b4d5: am 2322a910: am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit '55f0c8743555cbc9276c79afad8a0b633b012ec7':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 21:43:45 +00:00
Deepanshu Gupta
3b7ab1cf7d am 4f9bb377: am 93d10eda: am db83a08b: am 86726f58: am eb5b38b1: (-s ours) am a350f96e: am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NO 
* commit '4f9bb377590f81e80da1caf69243507a5a704189':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:43:41 +00:00
Deepanshu Gupta
613cf6ed49 am 8fdd8f65: am 3d491e37: am 84cea707: am 0573cffa: am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '8fdd8f6576f2ec02da1a5b7c25d9b903b4fe8c05':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:43:38 +00:00
Deepanshu Gupta
dcf080d571 am 56a794f2: am 96e30774: am fea4b4dd: am 3450dc32: am 06018d92: am f41a380b: am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit '56a794f2bf3093c9b24889e44abdcefaa976ed12':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 21:38:02 +00:00
Deepanshu Gupta
465a99260e am 21dc46b1: am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '21dc46b14df9456eede9d4eb7082c85bec732058':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:37:58 +00:00
Deepanshu Gupta
83dcd3f97f am bda6d9a1: am 9a3e6ec7: am cdc40eb0: am 6fd1703e: (-s ours) am 0d33f604: am 4dff881b: am 7b9cc710: (-s ours) am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit 'bda6d9a15a845611e0d68acbf09787da71532287':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 21:37:55 +00:00
Deepanshu Gupta
55f0c87435 am 5f421714: am 03ccc80d: am c909b4d5: am 2322a910: am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit '5f421714a64def639e112e0537d16b8a10829938':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 21:37:52 +00:00
Deepanshu Gupta
4f9bb37759 am 93d10eda: am db83a08b: am 86726f58: am eb5b38b1: (-s ours) am a350f96e: am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit '93d10eda4f4bfd6bafcffb6f3c5bea7662cd0193':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:37:49 +00:00
Deepanshu Gupta
8fdd8f6576 am 3d491e37: am 84cea707: am 0573cffa: am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '3d491e379045d571367e1eaef404393a80c5771d':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:37:46 +00:00
Deepanshu Gupta
56a794f2bf am 96e30774: am fea4b4dd: am 3450dc32: am 06018d92: am f41a380b: am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit '96e30774c019e1f4400ac2d7a724ea7328bec1ac':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 21:33:14 +00:00
Deepanshu Gupta
21dc46b14d am 569dc64c: am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '569dc64cd6b0bb7bdfec97967b192d2a706e3f81':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:33:07 +00:00
Deepanshu Gupta
bda6d9a15a am 9a3e6ec7: am cdc40eb0: am 6fd1703e: (-s ours) am 0d33f604: am 4dff881b: am 7b9cc710: (-s ours) am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit '9a3e6ec73c2188eb5bf1406b974dfc34e55722ad':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 21:33:03 +00:00
Deepanshu Gupta
5f421714a6 am 03ccc80d: am c909b4d5: am 2322a910: am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit '03ccc80d0a00df9d5a4d5039941a8edfe2404868':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 21:33:00 +00:00
Deepanshu Gupta
93d10eda4f am db83a08b: am 86726f58: am eb5b38b1: (-s ours) am a350f96e: am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit 'db83a08b133d5c618d21ba105b0852e463cfb6d7':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:32:57 +00:00
Deepanshu Gupta
3d491e3790 am 84cea707: am 0573cffa: am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '84cea70792145e345d5bde8838dad14cc3e9fa4c':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:32:54 +00:00
Deepanshu Gupta
9dad1cff17 am f14922db: am 6368a39d: am 883a17cd: am 14480abe: am bfc75f68: am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit 'f14922db63c866eee3f3eda63c57e08955fa27cb':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:32:53 +00:00
Deepanshu Gupta
96e30774c0 am fea4b4dd: am 3450dc32: am 06018d92: am f41a380b: am d10ca17d: am 8921409a: am 10fb4fe4: am d99dd3e7: am 70efbad0: am bd5a3e65: am 1677a9bd: Merge "resolve conflicts for merge 5a7b3b65 correctly" into jb-dev-plus-aosp 
* commit 'fea4b4dde360cf5caa0fe887dbcc51a0a2329e25':
  resolve conflicts for merge 5a7b3b65 correctly
 2014-05-13 21:28:32 +00:00
Deepanshu Gupta
569dc64cd6 am 69ab5946: am fcfb8801: am 18b1525a: am ef24a509: am 900954e3: am 2100476a: am 31a3760a: am 964023c5: am 8bf73eae: am 0ad4f2ce: resolved conflicts for merge of 7377c7be to jb-mr1-dev 
* commit '69ab594625e274ed4ca6d4a1dc7f8fb19d44f020':
  Add Navigation Bar to BridgeWindowManager [DO NOT MERGE]
 2014-05-13 21:28:18 +00:00
Deepanshu Gupta
9a3e6ec73c am cdc40eb0: am 6fd1703e: (-s ours) am 0d33f604: am 4dff881b: am 7b9cc710: (-s ours) am 9c7e3064: am 1b0f6056: am c1847b54: am 5454be00: am 5dae7fda: am 9359dc2e: am 2d3fa7ba: Support actionProviderClass attribute for menus [DO NOT MERGE] 
* commit 'cdc40eb0e02e5b7abc05a438f7fd51045ec91862':
  Support actionProviderClass attribute for menus [DO NOT MERGE]
 2014-05-13 21:28:16 +00:00
Deepanshu Gupta
03ccc80d0a am c909b4d5: am 2322a910: am 75fc74d6: am 203964c0: am b7e1bef1: am b607cb82: am 27c9b568: am e969ee5e: resolved conflicts for merge of d388afad to jb-mr1.1-dev 
* commit 'c909b4d53b7359c794f7885e99f04746646275ec':
  Add special system view cookie to OverflowButton. [DO NOT MERGE]
 2014-05-13 21:28:14 +00:00
Deepanshu Gupta
db83a08b13 am 86726f58: am eb5b38b1: (-s ours) am a350f96e: am 0eb268a0: am 22dabb52: (-s ours) am c261cb0d: am f354d01a: am aab60856: am ebd909cc: am ae5e0c7b: am 4eab4e14: am 5268248e: Use ApplicationInfo only when not in edit mode [DO NOT MERGE] 
* commit '86726f58dba0f2ee6d7e62255dbf7356a7201897':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
 2014-05-13 21:28:12 +00:00
Deepanshu Gupta
84cea70792 am 0573cffa: am b520cc45: am cf2af661: am 752b90f2: am 919ce205: am 03bf747f: am 858ab06a: am ec1b4df6: resolved conflicts for merge of b161d6ba to jb-mr1.1-dev 
* commit '0573cffacc4a7247151aae62d176a9e947e1dabe':
  Fix style warnings in RenderSessionImpl [DO NOT MERGE]
 2014-05-13 21:28:10 +00:00
Deepanshu Gupta
f14922db63 am 6368a39d: am 883a17cd: am 14480abe: am bfc75f68: am 11243dd6: am 9f5f450d: am e5c518cb: am 4e8b055b: am 6dad59e1: am 85b75194: resolved conflicts for merge of cc9e3596 to jb-mr1.1-dev 
* commit '6368a39dd2b57907a47b7a1693de1c7744a0a39c':
  Add view cookies for action bar menus. [DO NOT MERGE]
 2014-05-13 21:26:33 +00:00