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

3214 Commits

Author SHA1 Message Date
Deepanshu Gupta
b9b8aef94e Fix import order. 
Change-Id: I50bfbf4011290683a1c6adb94e0b6fa301dcc75b
 2015-03-13 15:24:59 -07:00
Clara Bayarri
4423d91de5 Add a type parameter to startActionMode() calls. 
This requires adding a new method to View and Window.Callback to pass
down the type as a parameter.

For compatibility purposes, the new method implementations keep the
type and call the old method, in case clients have subclassed it.

Change-Id: If5d857f131e33be8cc6a8814f2e9c4e85ad2da25
 2015-03-13 10:51:51 +00:00
Deepanshu Gupta
28070f43a6 am a4277e14: am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 
* commit 'a4277e149355c53fde73a4e1ef44aa665af31cf0':
  Tools attribute improvements for RecyclerView LayoutManager.
 2015-03-13 06:33:44 +00:00
Deepanshu Gupta
a53f76dcce am 3d024d4c: am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit '3d024d4c22b896c95ef4c98610c3db7c58a639ed':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-13 06:33:17 +00:00
Deepanshu Gupta
1bbb9e1d5d am fceec0e1: am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 
* commit 'fceec0e124a55b25d59f2af5279c70ac045d6771':
  Fix rare NPE in BridgeContext.
 2015-03-13 06:32:49 +00:00
Deepanshu Gupta
cfed1b5222 am ca9264ea: am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev 
* commit 'ca9264eab03cf787fb4dfc62a2313d9c3b45a05e':
  Fix project settings.
 2015-03-13 06:32:40 +00:00
Andreas Gampe
d88a9bc821 resolved conflicts for merge of ef1741d2 to master 
Change-Id: I5379d5f756695f5176d92249ac6304bffcf95751
 2015-03-12 23:25:27 -07:00
Deepanshu Gupta
a4277e1493 am a4ed5e94: am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 
* commit 'a4ed5e94117a2c6c1734138faed09490245c602f':
  Tools attribute improvements for RecyclerView LayoutManager.
 2015-03-12 02:01:57 +00:00
Deepanshu Gupta
a4ed5e9411 am e770c5e4: am c44430a3: Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 
* commit 'e770c5e45a139d709976f8c1dbb821733968b5a8':
  Tools attribute improvements for RecyclerView LayoutManager.
 2015-03-12 01:55:16 +00:00
Deepanshu Gupta
c44430a368 Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 2015-03-12 01:16:45 +00:00
Deepanshu Gupta
3d024d4c22 am 65215edd: am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit '65215edd7acada70c2bcb060daec6ff718ae92ba':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 01:08:57 +00:00
Deepanshu Gupta
65215edd7a am f0d324e5: am 71ba1230: am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit 'f0d324e531e395674f71b3944623bd17fe74b372':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:59:39 +00:00
Deepanshu Gupta
fceec0e124 am c7fc094d: am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 
* commit 'c7fc094d319998572087e983e21c62de9f318139':
  Fix rare NPE in BridgeContext.
 2015-03-12 00:56:52 +00:00
Deepanshu Gupta
ca9264eab0 am a695f87d: am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev 
* commit 'a695f87db757e89ee99d3c672037b479dce3e4e7':
  Fix project settings.
 2015-03-12 00:56:47 +00:00
Deepanshu Gupta
ef1741d27b am 05cba2f8: am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev 
* commit '05cba2f8acd88d40e1bb149915fe590d4a21b74d':
  Add RecyclerView support.
 2015-03-12 00:56:41 +00:00
Deepanshu Gupta
71ba12308e am efc09c64: am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit 'efc09c644fa4e8354d54485aab6c0b18868284eb':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:45:40 +00:00
Deepanshu Gupta
c7fc094d31 am d44af610: am b3cfb334: Merge "Fix rare NPE in BridgeContext." into lmp-mr1-dev 
* commit 'd44af6108b18f3de05ed3f61d056d9c5b36ff8be':
  Fix rare NPE in BridgeContext.
 2015-03-12 00:45:35 +00:00
Deepanshu Gupta
a695f87db7 am fa3c6650: am 71518174: Merge "Fix project settings." into lmp-mr1-dev 
* commit 'fa3c665019ace11140b3c5677d02c9711fc4d86d':
  Fix project settings.
 2015-03-12 00:45:31 +00:00
Deepanshu Gupta
05cba2f8ac am 338a5a88: am b171be1a: Merge "Add RecyclerView support." into lmp-mr1-dev 
* commit '338a5a88fe8ecf8a724fcfaa2888a7c0fe53cb34':
  Add RecyclerView support.
 2015-03-12 00:45:27 +00:00
Deepanshu Gupta
efc09c644f am 78660423: Merge "Fix cyclic dependency in BlendComposite and BlendingMode." into lmp-dev 
* commit '78660423900fa255cc83b85320e98d5184be393b':
  Fix cyclic dependency in BlendComposite and BlendingMode.
 2015-03-12 00:38:45 +00:00
Deepanshu Gupta
0412b317ac Tools attribute improvements for RecyclerView LayoutManager. 
1. Change tools attribute for layout manager from layoutManagerType to
LayoutManager.
2. Support classnames in the tools attribute.

This change doesn't try to supprt arbitrary classnames for now. The
reason for this is that the new layoutlib API is supposed to contain a
new method for inflating custom classes that are not views. This will
allow us to throw better error messages. Without the new API, trying for
different constructors, will result in a error messages being logged.

Change-Id: I3a31359c06b7452bfd973c3e5e54f9038acccfaa
 2015-03-11 17:26:48 -07:00
Deepanshu Gupta
5521f65ecb Fix cyclic dependency in BlendComposite and BlendingMode. 
Introduced in commit 1a10ca7e526736b4fd143f7c9f3b29643c0062a4

Bug: http://b.android.com/159708
Change-Id: I6add5be3a933bbe4f8d888906e2aa1b2e35d045a
 2015-03-11 17:04:21 -07:00
Deepanshu Gupta
85d72c4535 Fix rare NPE in BridgeContext. 
Also fixed some deprecation warnings.

Change-Id: I2fa00996dab0b008b9ca07a5382a059e5780529d
 2015-03-11 15:56:30 -07:00
Deepanshu Gupta
7b2cae5072 Fix project settings. 
1. Update layoutlib_api source path.
2. Update jdk version
3. Update nullity annotations.

Change-Id: I48db7dbd7ba5ff02fcf11672608b75e072385166
 2015-03-10 18:16:21 -07:00
Deepanshu Gupta
d345f44a87 Add RecyclerView support. 
Bug: http://b.android.com/72117
Change-Id: Iba95baff59f1b715f91da25e15acf27bc052d95e
 2015-03-10 18:16:21 -07:00
Diego Perez
fe12aa7774 Add support for the new native Builder class on StaticLayout. 
This patch updates StaticLayout_Delegate to support the new Builder
class introduced in ag/646289.

Change-Id: I9f8c528b8751ce69482e33ac6f1bc42406a0b606
 2015-03-10 13:51:01 +00:00
Dan Albert
9488813873 am 7a79c4ca: am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master 
* commit '7a79c4cac3b0c722832e868346db2375b6d6c379':
  Stop using namespace std.
 2015-03-05 23:56:53 +00:00
Dan Albert
7a79c4cac3 am f8d6a4ba: resolved conflicts for merge of 701f9c2f to stage-aosp-master 
* commit 'f8d6a4ba8739e16e13ae0014efa099ec564939a7':
  Stop using namespace std.
 2015-03-05 23:50:35 +00:00
Dan Albert
f8d6a4ba87 resolved conflicts for merge of 701f9c2f to stage-aosp-master 
Change-Id: I42e0411c0acef4b15137491ecaaed95d9b1cd0c1
 2015-03-05 15:41:39 -08:00
John Reck
f4faeac352 Cleanup Bitmap JNI attempt #2 
Original version missed a spot

This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.

Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
 2015-03-05 13:56:16 -08:00
Andrew Shulaev
3782882192 Merge "Added function to render a drawable in all available states" 2015-03-05 14:39:54 +00:00
Andrew Shulaev
1f158819bc Added function to render a drawable in all available states 
This reverts commit 01cdf8b135be3bf67b9386dc929109c3db82c730.

Change-Id: I596855047d78c3c718744ad61432fc45e1239634
 2015-03-05 11:51:38 +00:00
Diego Perez
d5e11f6f47 Merge "Fix crash when shadowSize is 0" 2015-03-05 10:13:02 +00:00
Dan Albert
030f536009 Stop using namespace std. 
The pattern of #include and using namespace std here fails to build
with GCC. At first glance it's a GCC bug rather than libc++ doing
something wrong. Regardless, it can be worked around by just
specifying std:: where appropriate.

Bug: 19606303
Change-Id: I5652682eae7ca7559cf2a9307909859013440781
 2015-03-04 13:54:20 -08:00
Andrew Shulaev
01cdf8b135 Revert "Added function to render a drawable in all available states" 
This reverts commit 63483e17de4d2441acaabcee4185b0bb25e1d94c.

Change-Id: I07fced229759e63d4fa4f94b7dac48b3e9342b18
 2015-03-04 17:43:19 +00:00
Andrew Shulaev
63483e17de Added function to render a drawable in all available states 
Change-Id: I230cc5775a09120efe9c82a4017b001aa510ddff
 2015-03-04 16:57:06 +00:00
Diego Perez
e81096458f Fix crash when shadowSize is 0 
Change-Id: I9f131afc95a2571fbc8a737df37f43653cfbb90d
 2015-03-04 16:46:21 +00:00
Deepanshu Gupta
6672afbe7d am 70775bed: am fb96187b: am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit '70775beddd3773a942084f5ef939da0a70065475':
  Correct PorterDuff filters.
 2015-03-02 22:46:30 +00:00
Deepanshu Gupta
5ae7f103be am 6e64fabe: am 7c4ab9de: am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit '6e64fabecafcc4c367dc04cd071ff8ddc8bb3d85':
  Fix codestyle for switch statements.
 2015-03-02 22:46:23 +00:00
Deepanshu Gupta
a104b1886b am 1fe1022d: am 4a194d3b: am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit '1fe1022dbd7642373e0e2d465d29ad3e1226a8b2':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 22:46:16 +00:00
Deepanshu Gupta
4c74da90db am c74295db: am bf815f49: am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev 
* commit 'c74295db3048d964679913f146511ce3ad838089':
  Add status bar time for 5.1
 2015-03-02 22:45:57 +00:00
Deepanshu Gupta
70775beddd am fb96187b: am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit 'fb96187bb6004e5d0b22e4d942aa236a08d8913b':
  Correct PorterDuff filters.
 2015-03-02 20:11:02 +00:00
Deepanshu Gupta
6e64fabeca am 7c4ab9de: am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit '7c4ab9deaaea0e0a273c7bdf37b6d9d1c8cbab07':
  Fix codestyle for switch statements.
 2015-03-02 20:10:56 +00:00
Deepanshu Gupta
1fe1022dbd am 4a194d3b: am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit '4a194d3b7f3ea4aebc5a1a8f95ccaac248c1b89d':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 20:10:50 +00:00
Deepanshu Gupta
fb96187bb6 am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit '32dc37b72e787ca9323c01aa86e65694b6ff0cf7':
  Correct PorterDuff filters.
 2015-03-02 20:03:37 +00:00
Deepanshu Gupta
7c4ab9deaa am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit '4e87709b8b41a12d6caf2bd1110beed20e5b88e5':
  Fix codestyle for switch statements.
 2015-03-02 20:03:32 +00:00
Deepanshu Gupta
4a194d3b7f am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit '6250030736e3ea25bacc92eba4c269dc6a6ee3db':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 20:03:28 +00:00
Deepanshu Gupta
c74295db30 am bf815f49: am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev 
* commit 'bf815f495270b466e53bec20772b41ff4397ac83':
  Add status bar time for 5.1
 2015-03-02 19:53:32 +00:00
Deepanshu Gupta
f2c1c09683 am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit '6ed9b75a45ec4bc62b4a0fac2c86479d61918863':
  Correct PorterDuff filters.
 2015-03-02 19:52:33 +00:00
Deepanshu Gupta
2022b0ffdd am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit 'd003e8133167f2b6741f8eb925fdc9f77c2800a5':
  Fix codestyle for switch statements.
 2015-03-02 19:52:29 +00:00