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

1657 Commits

Author SHA1 Message Date
Deepanshu Gupta
1f9a26af95 am 158c08bc: am ada85905: Fix AppCompat action bar theming. 
* commit '158c08bcf1cd0bc702748ee2a4cf6aa259c26147':
  Fix AppCompat action bar theming.
 2015-03-17 14:16:50 +00:00
Deepanshu Gupta
9a00f1c84b am 79f7fce7: am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '79f7fce7a49e7b7cd414ff5c3fdb5cbaae45c1f1':
  Fix NoActionBar themes rendering.
 2015-03-17 14:16:42 +00:00
Deepanshu Gupta
158c08bcf1 am ada85905: Fix AppCompat action bar theming. 
* commit 'ada8590547348b77d8cbd56abdb8fadb3e72c015':
  Fix AppCompat action bar theming.
 2015-03-17 00:21:02 +00:00
Deepanshu Gupta
79f7fce7a4 am 2e4d9324: Fix NoActionBar themes rendering. 
* commit '2e4d93245764a1c1d7515361ddbb8fc1665f814e':
  Fix NoActionBar themes rendering.
 2015-03-17 00:20:58 +00:00
Deepanshu Gupta
ada8590547 Fix AppCompat action bar theming. 
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.

 - Set project callback when LayoutInflater is created by
   LayoutInflater.from(context).
 - Remove duplication of code to get base context from context wrapper.

Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
 2015-03-16 11:45:00 -07:00
Deepanshu Gupta
2e4d932457 Fix NoActionBar themes rendering. 
Also fix some warnings.

Bug: http://b.android.com/159780
Change-Id: I64fd4259b802722af7a271f51d5943018ed11e9e
 2015-03-13 14:28:14 -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
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
Deepanshu Gupta
aff0ec93f2 am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit '81449b2c4a63392bff22d77f331f4db52011884b':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 19:52:25 +00:00
Deepanshu Gupta
bf815f4952 am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev 
* commit '7b4caab1a87b659498d30af194ae511526c503ba':
  Add status bar time for 5.1
 2015-03-02 19:47:29 +00:00
Deepanshu Gupta
6ed9b75a45 am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-dev 
* commit '72d75f8d9fb46c04f0458e1f36b064e2b8c3de71':
  Correct PorterDuff filters.
 2015-03-02 19:44:51 +00:00
Deepanshu Gupta
d003e81331 am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-dev 
* commit '369ad57b00f1c94c80f0f80ef2e7063a23a94a84':
  Fix codestyle for switch statements.
 2015-03-02 19:44:47 +00:00
Deepanshu Gupta
81449b2c4a am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 
* commit '10d620ff2c4770e926b693e833105e8dbbd5fa86':
  Better error msg for StateList/Hexadecimal Color.
 2015-03-02 19:44:43 +00:00
Deepanshu Gupta
72d75f8d9f Merge "Correct PorterDuff filters." into lmp-dev 2015-03-02 19:40:14 +00:00
Deepanshu Gupta
369ad57b00 Merge "Fix codestyle for switch statements." into lmp-dev 2015-03-02 19:37:32 +00:00
Deepanshu Gupta
10d620ff2c Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev 2015-03-02 19:37:04 +00:00
Deepanshu Gupta
2045061aac Add status bar time for 5.1 
Change-Id: I9469cdbbc5cbfe5cb99d9c4ee6f4e299246d409f
 2015-02-26 19:35:54 -08:00
Deepanshu Gupta
1a10ca7e52 Correct PorterDuff filters. 
1. Remove unused modes - makes the class more manageable, and missing
modes can always be readded from the git history.
2. Reuse the existing BlendComposite instances where possible.
3. Fix incorrect alpha computation for multiply mode.
4. Change the alpha computation for all blend modes to compenstate for
the fact that the color filter image that we create extends beyond the
image it is inteded to be applied to.

Change-Id: Iedebf289a23325ee4c6d406dcad46a9edb1855c7
 2015-02-26 15:02:16 -08:00
Deepanshu Gupta
d68448a601 Fix codestyle for switch statements. 
Fix intellij's codestyle settings for indenting switch/case statement.

Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f
 2015-02-26 14:32:30 -08:00
Joe LaPenna
57bb5f5c8b am c0c39516: Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev 
* commit 'c0c395162ff14b83694158663470ad60e065d9a9':
  Hold a wake lock while dozing when display updates are pending.
 2015-02-24 00:46:48 +00:00
Joe LaPenna
c0c395162f Merge "Hold a wake lock while dozing when display updates are pending." into lmp-mr1-modular-dev 2015-02-24 00:37:15 +00:00
Deepanshu Gupta
68501b87d2 Better error msg for StateList/Hexadecimal Color. 
Throw a better error message when resolving a hexadecimal color value
but the user gave a Color State List. The two are easy to confuse since
the only way to distinguish between the two is to look at the
definition.

Bug: http://b.android.com/70110
Change-Id: Ic78962bd0674a92296a0fdd0de184cfe4d85a8e4
 2015-02-23 12:00:38 -08:00
Deepanshu Gupta
01d5286f38 am 8f022fd3: am 5ed4fc9e: am 99142d29: am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '8f022fd323063f9cebb481be650db40cf5e486f3':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:29:31 +00:00
Deepanshu Gupta
99142d2982 am 3f8e2b93: am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '3f8e2b9302fba0ace67fb0459d6ffb0884c4d80b':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:09:14 +00:00
Deepanshu Gupta
3f8e2b9302 am 30a67cd1: Merge "Set forceFramework correctly for included layouts." into lmp-dev 
* commit '30a67cd17af03e53b8be5638f7f70d2989a7cd78':
  Set forceFramework correctly for included layouts.
 2015-02-23 19:03:29 +00:00