2711 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Deepanshu Gupta
ca67a24929 am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.
* commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213':
  Special case AppCompat to show action bar.
2015-01-10 03:51:05 +00:00
Deepanshu Gupta
bb600de6e7 am 74147527: am 8505c387: Special case AppCompat to show action bar.
* commit '74147527357b9abd9d30b3a2dbd72a5172a35625':
  Special case AppCompat to show action bar.
2015-01-10 02:16:44 +00:00
Deepanshu Gupta
7414752735 am 8505c387: Special case AppCompat to show action bar.
* commit '8505c3870a17f41d23329344fe381cd9ff324bd2':
  Special case AppCompat to show action bar.
2015-01-10 02:10:55 +00:00
Deepanshu Gupta
dbd64f7c90 Support Locale.toLanguageTag on Java 6
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit 5cd9dde5a2a77c5095f985186d8f03147fd22870)
2015-01-09 17:43:12 -08:00
Deepanshu Gupta
51fb7754fc LayoutLib: Fix System.arraycopy()
Framework has specialized versions of java.lang.System.arraycopy() for
all primitive data types. These versions are not present on the Desktop
VM. This change replaces calls to any of the specialized versions with
the more general alternative - the one using Objects.

Note that this was already being done for char.

Change-Id: If1584125fea8ecc080fb39a5ee6cdb4d922d0c98
(cherry picked from commit e1960cc0b541cda93db94de5bef42dff922b9ec3)
2015-01-09 17:03:54 -08:00
Deepanshu Gupta
8505c3870a Special case AppCompat to show action bar.
Bug: http://b.android.com/78944
Change-Id: I02d68d592d812016744716f99376cfefd519b21b
2015-01-10 00:29:52 +00:00
Deepanshu Gupta
0b1188e3c1 am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
* commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a':
  Fix tests on jenkins, take 2.
2015-01-07 19:46:03 +00:00
Deepanshu Gupta
d657b14927 Fix tests on jenkins, take 2.
Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0
2015-01-07 11:22:22 -08:00
Deepanshu Gupta
7f9582ce61 am 48603a39: Fix tests on jenkins
* commit '48603a39d4dd721d231c99e10908f4f00c4ec6b9':
  Fix tests on jenkins
2015-01-07 01:43:39 +00:00
Deepanshu Gupta
48603a39d4 Fix tests on jenkins
When the tests are run on the build server, they are run from the jar,
as opposed to the extracted build, which is default when run from an
IDE. Thus, when class.getResourceAsStream() is called with ".." in the
path, it is not resolved properly. This change explicitly resolves the
relative path, so that the test is run properly on the server.

Change-Id: Ib5fabd617dca4052220e5173a8bf4fb4234254ff
2015-01-06 17:32:26 -08:00
Deepanshu Gupta
a6671b7074 am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev
* commit '6461e05420c6f42b0e70134a4e0d2a626161ab74':
  Add image comparison to LayoutLib tests.
2015-01-05 23:33:18 +00:00
Deepanshu Gupta
0db2524caa am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-dev
* commit 'b2ebb9683fb5b21543b50772a0d4c646ced7764b':
  Remove Time from CreateInfo
2015-01-05 23:33:14 +00:00
Deepanshu Gupta
937db7a39e am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
* commit '53f73a97542c277a519b973060dfa217849b66de':
  Add DatePicker, CalendarView to LayoutLib tests
2015-01-05 23:33:10 +00:00
Deepanshu Gupta
e69e4f8b4d am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev
* commit 'f9bb0b5e133b0c364c3f87623f0fdff0fedc5226':
  Fix DatePicker rendering.
2015-01-05 23:33:06 +00:00
Deepanshu Gupta
8c686ddd54 am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev
* commit 'd20a518c82e5e33d33e3dc5d74bf3c17d807f7d7':
  Make Preference-cookie map non static.
2015-01-05 23:33:02 +00:00
Deepanshu Gupta
cec8e5a10d am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev
* commit 'f861c0ce3ff42550f3d5ede837e7bfb3855f5964':
  Fix default initial value for preferences
2015-01-05 23:32:58 +00:00
Deepanshu Gupta
7ed145493d am 7081a114: Merge "Add preferences rendering." into lmp-dev
* commit '7081a114d4ee190c746f337057b0f84928c162dd':
  Add preferences rendering.
2015-01-05 23:32:53 +00:00
Deepanshu Gupta
58df125bbc Add image comparison to LayoutLib tests.
The LayoutLib rendering tests now compares the rendered image with a
golden file from a previous execution. This will help catch any
unexpected changes in the final rendering.

Change-Id: I80251a778e89df7d7ec13863a8f299967f3d747d
2015-01-05 11:32:41 -08:00
Deepanshu Gupta
4022272a4f Remove Time from CreateInfo
Time_Delegate was removed in change with Change-Id:
Iae5ef65678f0e6c7c5af520c45bd15980ce3fa55. But the name wasn't removed
from CreateInfo. This didn't cause any problems at runtime, but caused
the layoutlib_create tests to fail.

Change-Id: I079b1e024b97d389eb07d4f088fd860efbb02eb3
2015-01-02 13:55:20 -08:00
Deepanshu Gupta
eae390a94e Add DatePicker, CalendarView to LayoutLib tests
Change-Id: Ice8c41ff90ccb0ffe90fcbfcccc91ea24225a3d9
2015-01-02 11:20:19 -08:00
Deepanshu Gupta
e64a5bd2fb Fix DatePicker rendering.
1. Return AccessibilityManager service from context.
2. Don't throw an exception if no style specifited in
obtainStyledAttributes. Specifying no style is valid and it's supposed
to use the default theme in that case.

Bug: http://b.android.com/82712 and http://b.android.com/79218
Change-Id: Iba7097f36996e4d6f1e9db778dc73294f2854c79
2014-12-29 12:29:16 -08:00
Deepanshu Gupta
0ff4568ca0 Make Preference-cookie map non static.
Moved the map from Preference to View Cookie to BridgeContext. This
means the map need not be static anymore.

NO_SQ: Depends on unsubmitted changes.
Change-Id: I662513def17bd6ec3a2646c3bec9bf4f9f89fc15
2014-12-23 12:04:30 -08:00
Deepanshu Gupta
dfeffd4c0a Fix default initial value for preferences
NO_SQ: Depends on unsubmitted changes.
Change-Id: I061cf71f6167d382e9ef060abeb4d5cff83c4104
2014-12-23 12:04:30 -08:00
Deepanshu Gupta
10bb1371dc Add preferences rendering.
NO_SQ: Depends on updating layoutlib-api-prebuilt.jar
Change-Id: Iae93ab74c478e6f2158e1528467bec9ee2d7ee9b
2014-12-23 12:04:30 -08:00
Deepanshu Gupta
6cbef4bd3e am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev
* commit '03af0c42d80734c44198b96a99488bb94816ae97':
  Ensure that RandomAccessFile is not leaked.
2014-12-03 20:58:27 +00:00