drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
161,038 Commits 1 Branch 0 Tags
4c173f3168
Commit Graph

1479 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
c44430a368 Merge "Tools attribute improvements for RecyclerView LayoutManager." into lmp-mr1-dev 2015-03-12 01:16:45 +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
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
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
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
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
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
Deepanshu Gupta
33c1c07796 Set forceFramework correctly for included layouts. 
Bug: http://b.android.com/151326
Change-Id: I759f6e1a7a1c83bbbb771ddbb92843a105acffa4
 2015-02-23 17:26:12 +00:00
Deepanshu Gupta
0a300b8977 am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev 
automerge: 0684991

* commit '068499111c173fdd9869e7dbe5b9de857aca1c2d':
  Add Asset management support for fonts.
 2015-02-17 22:21:11 +00:00
Diego Perez
a0fb87a3b8 am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev 
automerge: a912fed

* commit 'a912fedbc5fba99fb75884a1941d58170822ceb4':
  Do not paint shadow if outside of the clip area
 2015-02-17 22:19:43 +00:00
Deepanshu Gupta
221d732005 am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev 
automerge: 4e47416

* commit '4e47416012b8cb88d564a04a29c0b79a28b9e529':
  Changes made by intelliJ 14.1
 2015-02-17 22:18:35 +00:00
Deepanshu Gupta
068499111c am ad879adb: Merge "Add Asset management support for fonts." into lmp-dev 
* commit 'ad879adb65ffa577844738522ab6d7d30aba2ead':
  Add Asset management support for fonts.
 2015-02-13 22:38:23 +00:00
Diego Perez
a912fedbc5 am 98c3461a: Merge "Do not paint shadow if outside of the clip area" into lmp-dev 
* commit '98c3461acd6699ab0448f1785909d0d39cd61b5a':
  Do not paint shadow if outside of the clip area
 2015-02-13 22:38:17 +00:00
Deepanshu Gupta
4e47416012 am 12c9e498: Merge "Changes made by intelliJ 14.1" into lmp-dev 
* commit '12c9e4980e889d1c72656a4062f9cee9a0e6f15a':
  Changes made by intelliJ 14.1
 2015-02-13 22:38:07 +00:00
Deepanshu Gupta
ad879adb65 Merge "Add Asset management support for fonts." into lmp-dev 2015-02-13 22:34:36 +00:00
Diego Perez
98c3461acd Merge "Do not paint shadow if outside of the clip area" into lmp-dev 2015-02-13 22:34:16 +00:00
Deepanshu Gupta
12c9e4980e Merge "Changes made by intelliJ 14.1" into lmp-dev 2015-02-13 22:33:48 +00:00
Deepanshu Gupta
19740a6212 Changes made by intelliJ 14.1 
Change-Id: Ia130266ad994ef327629db25a18f9d5702b983f4
 2015-02-04 11:17:33 -08:00
Diego Perez
0dfba38010 Do not paint shadow if outside of the clip area 
Change-Id: I064ccc1d1b206a29d9d0db1384782cb5dd5c65ca
 2015-02-04 11:57:20 +00:00
Deepanshu Gupta
d51834bdfa Add Asset management support for fonts. 
Change-Id: I10ca67dcffe244667d4ae0bda65dbc1aa6691d50
 2015-02-03 19:00:43 -08:00
Deepanshu Gupta
580937fc45 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
automerge: 7789447

* commit '7789447bd97c851b7a09623a417300590e5439d5':
  Limited AppCompat support
 2015-01-31 03:02:42 +00:00
Deepanshu Gupta
1575ca6e1a am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
automerge: 7e683bd

* commit '7e683bdaddff77a24a36d420c5782b47795c5ccb':
  Resource resolution fixes.
 2015-01-31 03:01:20 +00:00
Deepanshu Gupta
7789447bd9 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
* commit '3d5535cfb7755c20619529649b025c4682013b85':
  Limited AppCompat support
 2015-01-31 00:54:10 +00:00
Deepanshu Gupta
7e683bdadd am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
* commit '1d59871e4e8a3a657dab3931d684706c45630a2f':
  Resource resolution fixes.
 2015-01-31 00:54:07 +00:00
Deepanshu Gupta
224e931fed Limited AppCompat support 
Change-Id: I4ac7234c9533b9f47f070335c4cb6ae605d8a89f
 2015-01-28 11:32:30 -08:00
Deepanshu Gupta
b6864ac6cd Resource resolution fixes. 
1. Some dynamic ids weren't created and resulted in ResourceNotFound
exceptions.
2. Prevent NPE if a style attribute (eg. style="?attr/foo"), which
cannot be resolved, is resolved. This effectively, also results in
making it harder to catch misconfigured themes. However, support
library does it, and we don't want to throw errors when the library is
working as intended.

Change-Id: I731d8fb9209eb72b464d235d1072d416e132970b
 2015-01-15 15:25:49 -08:00
Deepanshu Gupta
f2e04ac7ea am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'c598047d67f64e690f682d82c0e77989c79ae465':
  Special case AppCompat to show action bar.
 2015-01-10 04:04:22 +00:00
Deepanshu Gupta
c598047d67 am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. 
* commit 'ca67a249293d021808f349fa2e2f799451aeafe8':
  Special case AppCompat to show action bar.
 2015-01-10 03:56:47 +00:00