Deepanshu Gupta
b4506586dc
am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 automerge: 580937f automerge: c053438
...
automerge: df5a198
2015-01-31 04:23:50 +00:00
Deepanshu Gupta
a925a06a9d
am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd automerge: 1575ca6 automerge: 862cdd6
...
automerge: 6a43990
2015-01-31 04:22:45 +00:00
Deepanshu Gupta
df5a198710
am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 automerge: 580937f
...
automerge: c053438
2015-01-31 04:18:58 +00:00
Deepanshu Gupta
6a439908fc
am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd automerge: 1575ca6
...
automerge: 862cdd6
2015-01-31 04:17:35 +00:00
Deepanshu Gupta
580937fc45
am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev
...
automerge: 7789447
2015-01-31 03:02:42 +00:00
Deepanshu Gupta
1575ca6e1a
am 1d59871e: Merge "Resource resolution fixes." into lmp-dev
...
automerge: 7e683bd
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
Craig Mautner
165be0c70d
Remove TYPE_UNIVERSE_BACKGROUND from system
...
An experiment that is over and has been occupying space.
Fixes bug 18088522 item #7
Change-Id: Ib0fcaa24243ed9b0581143e1d5114c1fd2b0aa6e
2015-01-27 15:16:58 -08:00
Craig Mautner
83162a9027
Eliminate groupId and add task to AppWindowToken
...
Simplifies access by eliminating indirect referencing.
Fixes bug 18088522 item #15 .
Change-Id: I9049192a7f3e1028d60c4f2d4d4a0d4aad590aa4
2015-01-27 13:56:20 -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
c8807ebbd2
am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar. automerge: 8e2dd14
...
automerge: 2223018
2015-01-10 04:24:44 +00:00
Deepanshu Gupta
22230189be
am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action bar.
...
automerge: 8e2dd14
2015-01-10 04:14:54 +00: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
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
dbd64f7c90
Support Locale.toLanguageTag on Java 6
...
Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3
(cherry picked from commit 5cd9dde5a2
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 e1960cc0b5
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
e1d1abc35d
am 321bf433: am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev automerge: 03c822a
...
* commit '321bf43315ace2f091a54d514dd56902990bec7a':
Replace java.util.LinkedHashMap.eldest()
2015-01-08 01:54:13 +00:00
Deepanshu Gupta
96cdef7b75
am f0da92bf: am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev automerge: 33b2de7
...
* commit 'f0da92bfda9a7b393cac87436173c1284c7d48be':
Add missing DateFormat method.
2015-01-08 01:54:08 +00:00
Deepanshu Gupta
d00d143fbf
am f45420d0: am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev automerge: 7e39385
...
* commit 'f45420d0bd912de3da9506bbae12a0e4b789bd84':
Update platform.dir search in tests.
2015-01-08 01:53:56 +00:00
Deepanshu Gupta
321bf43315
am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev
...
automerge: 03c822a
2015-01-08 01:49:23 +00:00
Deepanshu Gupta
f0da92bfda
am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev
...
automerge: 33b2de7
2015-01-08 01:47:52 +00:00
Deepanshu Gupta
f45420d0bd
am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev
...
automerge: 7e39385
2015-01-08 01:46:46 +00:00
Deepanshu Gupta
2d14feb4c7
Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev
2015-01-08 01:31:55 +00:00
Deepanshu Gupta
169c11dd39
Merge "Add missing DateFormat method." into lmp-mr1-dev
2015-01-08 01:17:32 +00:00
Deepanshu Gupta
565b6b415a
Merge "Update platform.dir search in tests." into lmp-mr1-dev
2015-01-08 01:17:23 +00:00
Deepanshu Gupta
1330f79f95
Replace java.util.LinkedHashMap.eldest()
...
Provide an alternate implementation for the above method and replace the
calls to it, since the method is not available on host VM.
Change-Id: I329d86b457d1859b137da8fb2790ddd7f8efa788
2015-01-07 16:32:21 -08:00
Deepanshu Gupta
ec4b131db5
am 5df729ad: am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge: 0b1188e
...
* commit '5df729ad09b85cb68bdf37d58c5d429c2c8663a4':
Fix tests on jenkins, take 2.
2015-01-08 00:16:32 +00:00
Deepanshu Gupta
5df729ad09
am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev automerge: 0b1188e
...
* commit 'a98a9b30bea74478b9d1b3f16e3713f5c864e648':
Fix tests on jenkins, take 2.
2015-01-08 00:03:58 +00:00
Deepanshu Gupta
d8e99c5861
am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev
...
automerge: 0b1188e
2015-01-07 23:53:09 +00:00
Deepanshu Gupta
6aede34e24
Add missing DateFormat method.
...
Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
2015-01-07 12:26:31 -08:00
Deepanshu Gupta
0359b4b199
Update platform.dir search in tests.
...
The tests search for a built sdk using some heuristics. The default path
of the built sdk has changed now, and this updates the search
accordingly.
Change-Id: I36d465d8c5f6cfd971bbdf95878fb144de233c6c
2015-01-07 12:21:59 -08: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
b5af276e5e
am 2458f2b1: am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins
...
* commit '2458f2b12b5ec266538b2019b0f14fca4e772bdf':
Fix tests on jenkins
2015-01-07 10:25:58 +00:00
Deepanshu Gupta
2458f2b12b
am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkins
...
* commit 'fa490b78df732f484475e214eec033f89c5b40b7':
Fix tests on jenkins
2015-01-07 10:17:51 +00:00
Deepanshu Gupta
984823f543
am 7f9582ce: am 48603a39: Fix tests on jenkins
...
* commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5':
Fix tests on jenkins
2015-01-07 09:23:17 +00: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
416891cff2
am 27ce2763: Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp
...
* commit '27ce2763325bcb7940232a11892e12fb86053cf7':
resolve conflict for 8c831b2f
2015-01-07 00:57:22 +00:00
Deepanshu Gupta
31326967cf
am d5455fed: am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev
...
* commit 'd5455fedaf0a55dfe25cf94d6bbb9ecf6f305725':
Add image comparison to LayoutLib tests.
2015-01-07 00:45:41 +00:00
Deepanshu Gupta
f509c98ae9
am a2a5ce49: resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp
...
* commit 'a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2':
Remove Time from CreateInfo
2015-01-07 00:45:37 +00:00
Deepanshu Gupta
148d8641c5
am 5760f153: am c2e9875d: am 229ce665: am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into lmp-dev
...
* commit '5760f1535b0bb619c72e8d4478fc65283bd89eb7':
Add DatePicker, CalendarView to LayoutLib tests
2015-01-07 00:45:31 +00:00
Deepanshu Gupta
af03e6eafc
am 67cf0bf4: am 84097e39: am b187106c: am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-dev
...
* commit '67cf0bf421370c756d93ca52697fbce03e34c09c':
Fix DatePicker rendering.
2015-01-07 00:45:27 +00:00
Deepanshu Gupta
08de06ddf7
am adcd2241: am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." into lmp-dev
...
* commit 'adcd224135e3c12f483547ffa8bb2cb0250ba923':
Make Preference-cookie map non static.
2015-01-07 00:45:23 +00:00
Deepanshu Gupta
b79d83d34c
am d050df72: am addaeff9: am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" into lmp-dev
...
* commit 'd050df7275137f9c57ce79a7b46d51e2d1fb9290':
Fix default initial value for preferences
2015-01-07 00:45:18 +00:00
