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

2952 Commits

Author SHA1 Message Date
Chris Warrington
4308c2aea4 am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 
automerge: 4499888

* commit '449988872be61f273c91db13069d5b7172429032':
  Fix AAPT daemon mode with paths containg spaces.
 2015-02-10 20:14:44 +00:00
Chris Warrington
de3ab0a9e8 Fix AAPT daemon mode with paths containg spaces. 
Use new line as a delimiter rather than space.
Fixes: https://code.google.com/p/android/issues/detail?id=135757
Gradle CL: https://android-review.googlesource.com/130423

Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
 2015-02-09 21:20:52 -08:00
Deepanshu Gupta
df5a198710 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 automerge: 580937f 
automerge: c053438

* commit 'c05343828611ed0b82fae4edf7fe11e0e9087db1':
  Limited AppCompat support
 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

* commit '862cdd6f11490c060842599a58a400e284c937d9':
  Resource resolution fixes.
 2015-01-31 04:17:35 +00: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
Narayan Kamath
c2d5128039 Merge "Remove superfluous OpenSSL include paths." automerge: fe24754 
automerge: d555cd5

* commit 'd555cd550d634192e96e3b834f91aa9559a259db':
  Remove superfluous OpenSSL include paths.
 2015-01-23 10:54:44 +00:00
Adam Lesinski
e03f2cb2c2 Merge "AAPT: Use the right enum when checking for density configurations" into lmp-mr1-dev automerge: b443610 
automerge: 83f58a2

* commit '83f58a2f7afac98199536b3090fe6f767ffb3a0d':
  AAPT: Use the right enum when checking for density configurations
 2015-01-23 02:46:32 +00:00
Adam Lesinski
ed643e8182 AAPT: Use the right enum when checking for density configurations 
Bug:19116675
Change-Id: I2322d8d6bdf890005c80014273e5d07df735ed50
 2015-01-22 18:19:44 -08:00
Adam Langley
0e7829e428 Remove superfluous OpenSSL include paths. 
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.

Change-Id: I467f1b1d038b5136fa22b1230da134c394eac54e
 2015-01-22 17:15:13 -08:00
Adam Lesinski
d9bd08864e am aee7225e: Merge "Process base APK" into lmp-mr1-dev 
automerge: 554a6f5

* commit '554a6f5278ec05077d8252249afc911897fbfe76':
  Process base APK
 2015-01-20 21:55:12 +00:00
Adam Lesinski
42eea270a0 Process base APK 
The base APK may have resources with configurations that compete
against some splits. The base APK must be involved in the selection
of splits.

Bug:18982001
Change-Id: Ieb29b5a36cf2c68e7831484d98a9fd275acd97e8
 2015-01-16 14:11: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
Adam Lesinski
5c61dfc25f am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute usage" into lmp-mr1-dev 
* commit 'e488ce8668538b45c586eba21f5bca288d749686':
  AAPT: Handle all old unversioned attribute usage
 2015-01-14 20:47:47 +00:00
Adam Lesinski
28994d8d18 AAPT: Handle all old unversioned attribute usage 
All references to attributes defined in pre-LOLLIPOP_MR1 SDK
are moved to version qualified resource entries.

Bug:18221682
Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
 2015-01-14 12:02:15 -08: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

* commit '8e2dd14e7d327f3d92d57092c24ea2064f04fd1c':
  Special case AppCompat to show action bar.
 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
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
Adam Lesinski
6e2eb2df4c am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0 
* commit 'c04a21a0ef6cd97a45307e4c1de9088e57719ca2':
  Fixup aapt usage message
 2015-01-08 20:24:33 +00:00
Deepanshu Gupta
321bf43315 am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev 
automerge: 03c822a

* commit '03c822aa585c319fb9cd05f392d8518501cc4f79':
  Replace java.util.LinkedHashMap.eldest()
 2015-01-08 01:49:23 +00:00
Deepanshu Gupta
f0da92bfda am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev 
automerge: 33b2de7

* commit '33b2de7f34180983fe596ff9faa6955b032fa157':
  Add missing DateFormat method.
 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

* commit '7e393853656387757da2531d4e504d7cf32e738e':
  Update platform.dir search in tests.
 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
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

* commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9':
  Fix tests on jenkins, take 2.
 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
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
Johan Redestig
6ab7a7849c Fixup aapt usage message 
The --preferred-configurations option was renamed to
--preferred-density in fab5087 but only part of the
usage message was changed.

Change-Id: I89d270990023beca19605901d956d29d0b0b848b
 2015-01-07 09:40:58 +01: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
27ce276332 Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp 2015-01-06 23:00:39 +00:00
Deepanshu Gupta
e88c120ebf resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again 
The earlier resolution (a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2)
wasn't the right one. This fixes it.

Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98
 2015-01-06 14:58:37 -08:00
Deepanshu Gupta
d5455fedaf am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-dev 
* commit 'aebd7fdb66b41b77a3cf51a7cf6911e8db3c7199':
  Add image comparison to LayoutLib tests.
 2015-01-06 22:50:18 +00:00
Deepanshu Gupta
a2a5ce49b2 resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aosp 
Change-Id: I8894287fd43afc863d070cab04cfaa1bf70f7ebb
 2015-01-06 14:46:27 -08:00