summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am aee7225e: Merge "Process base APK" into lmp-mr1-devAdam Lesinski2015-01-205-88/+350
|\ | | | | | | | | | | | | automerge: 554a6f5 * commit '554a6f5278ec05077d8252249afc911897fbfe76': Process base APK
| * Process base APKAdam Lesinski2015-01-165-88/+350
| | | | | | | | | | | | | | | | | | 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
* | am e488ce86: am 94e30215: Merge "AAPT: Handle all old unversioned attribute ↵Adam Lesinski2015-01-143-48/+127
|\ \ | |/ | | | | | | | | | | usage" into lmp-mr1-dev * commit 'e488ce8668538b45c586eba21f5bca288d749686': AAPT: Handle all old unversioned attribute usage
| * AAPT: Handle all old unversioned attribute usageAdam Lesinski2015-01-143-48/+127
| | | | | | | | | | | | | | | | All references to attributes defined in pre-LOLLIPOP_MR1 SDK are moved to version qualified resource entries. Bug:18221682 Change-Id: Ifd739530ebcf99e6bc7ddb3f10bc5e05f0726e62
* | am f2e04ac7: am c598047d: am ca67a249: am bb600de6: am 74147527: am ↵Deepanshu Gupta2015-01-101-13/+23
|\ \ | |/ | | | | | | | | | | | | | | 8505c387: Special case AppCompat to show action bar. automerge: 8e2dd14 * commit '8e2dd14e7d327f3d92d57092c24ea2064f04fd1c': Special case AppCompat to show action bar.
| * am c598047d: am ca67a249: am bb600de6: am 74147527: am 8505c387: Special ↵Deepanshu Gupta2015-01-101-13/+23
| |\ | | | | | | | | | | | | | | | | | | case AppCompat to show action bar. * commit 'c598047d67f64e690f682d82c0e77989c79ae465': Special case AppCompat to show action bar.
| | * am ca67a249: am bb600de6: am 74147527: am 8505c387: Special case AppCompat ↵Deepanshu Gupta2015-01-101-13/+23
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | to show action bar. * commit 'ca67a249293d021808f349fa2e2f799451aeafe8': Special case AppCompat to show action bar.
| | | * am bb600de6: am 74147527: am 8505c387: Special case AppCompat to show action ↵Deepanshu Gupta2015-01-101-13/+23
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bar. * commit 'bb600de6e7c5c7a0a1d4b872d2ee100ccc353213': Special case AppCompat to show action bar.
| | | | * am 74147527: am 8505c387: Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '74147527357b9abd9d30b3a2dbd72a5172a35625': Special case AppCompat to show action bar.
| | | | | * am 8505c387: Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8505c3870a17f41d23329344fe381cd9ff324bd2': Special case AppCompat to show action bar.
| | | | | | * Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/78944 Change-Id: I02d68d592d812016744716f99376cfefd519b21b
| | | | | * | am c8cbff8b: Fix error when using list as actionBarNavMode. [DO NOT MERGE]Deepanshu Gupta2014-09-261-2/+7
| | | | | |\ \ | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | * commit 'c8cbff8bdc6c8e61a177eeb1aa728038e0aa86dd': Fix error when using list as actionBarNavMode. [DO NOT MERGE]
| | | | | | * Fix error when using list as actionBarNavMode. [DO NOT MERGE]Deepanshu Gupta2014-09-251-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bug in the framework leads to the wrong argument being passed to defStyleRes when obtaining styled attributes. The framework however just ignores the attribute in such a case. LayoutLib logs an error to help developers find bugs in their code. The bug was seen when using list as the actionBarNavMode. This change ignores the attribute if it detects that it's the framework bug. Also, we change the error to a warning. Change-Id: I58e1fe4469de0329a27b577d75c0a59c48d0381b
| | | | | * | am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" ↵Deepanshu Gupta2014-09-041-0/+4
| | | | | |\ \ | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '509e5db14908f85c1ad4b93e8bbed5afd4c2c8fe': Resolve color xml attributes properly. [DO NOT MERGE]
| | | | | | * Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-devDeepanshu Gupta2014-09-041-0/+4
| | | | | | |\
| | | | | | | * Resolve color xml attributes properly. [DO NOT MERGE]Deepanshu Gupta2014-08-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Color attributes were not being converted to int properly. The conversion to int was a simple string to int using base 16. This change resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format depending on the length of the attribute. All values that begin with '#' are treated as colors. Bug: http://b.android.com/73845 Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784 (cherry picked from commit 81564dfe60020fa977d39d168f682e9d61825660)
| | | | | * | | am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT ↵Deepanshu Gupta2014-09-041-2/+3
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE]" into klp-dev * commit '47a400131f026fd4afdf09e77fe82e79201c1458': Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
| | | | | | * | Fix "@null" resource values in LayoutLib. [DO NOT MERGE]Deepanshu Gupta2014-08-261-2/+3
| | | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/74072 Change-Id: Ib84906d86772ac3df2407e71ad2167797bec4542 (cherry picked from commit c9cd725f1013bed27e6f6594b176c10a6a4c0f16)
| | | | | * | am 59eedf52: Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1612-1/+1
| | | | | |\ \ | | | | | | |/ | | | | | | | | | | | | | | | | | | | | | * commit '59eedf528ca29a32b6d7f358f5076929f8fbb164': Layoutlib: Update wifi and battery icon for KK
| | | | | | * Layoutlib: Update wifi and battery icon for KKDeepanshu Gupta2014-08-1512-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5c80e83366bb7672049a6bf726d11cf6717f400
| | | | * | | Support Locale.toLanguageTag on Java 6Deepanshu Gupta2015-01-094-13/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I255e79e2c288cd24b350b7c26128bbbb0b2cb9a3 (cherry picked from commit 5cd9dde5a2a77c5095f985186d8f03147fd22870)
| | | | * | | LayoutLib: Fix System.arraycopy()Deepanshu Gupta2015-01-093-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
* | | | | | | am c04a21a0: Merge "Fixup aapt usage message" automerge: 64044d0Adam Lesinski2015-01-081-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c04a21a0ef6cd97a45307e4c1de9088e57719ca2': Fixup aapt usage message
| * | | | | | | Fixup aapt usage messageJohan Redestig2015-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The --preferred-configurations option was renamed to --preferred-density in fab5087 but only part of the usage message was changed. Change-Id: I89d270990023beca19605901d956d29d0b0b848b
| * | | | | | | Add appropriate casts for char16_t.Dan Albert2014-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | C++11 defines a real char16_t, which is not implicitly convertible to uint16_t (and by extension jchar). Add casts as needed. Bug: 18300613 Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
* | | | | | | | am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 03c822a * commit '03c822aa585c319fb9cd05f392d8518501cc4f79': Replace java.util.LinkedHashMap.eldest()
| * | | | | | | Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
| |\ \ \ \ \ \ \
| | * | | | | | | Replace java.util.LinkedHashMap.eldest()Deepanshu Gupta2015-01-073-2/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 33b2de7 * commit '33b2de7f34180983fe596ff9faa6955b032fa157': Add missing DateFormat method.
| * | | | | | | | Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Add missing DateFormat method.Deepanshu Gupta2015-01-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia03023e65ef4a7ec90b61f1f538cbe74868c63c5
* | | | | | | | | am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-devDeepanshu Gupta2015-01-081-2/+18
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 7e39385 * commit '7e393853656387757da2531d4e504d7cf32e738e': Update platform.dir search in tests.
| * | | | | | | | Merge "Update platform.dir search in tests." into lmp-mr1-devDeepanshu Gupta2015-01-081-2/+18
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Update platform.dir search in tests.Deepanshu Gupta2015-01-071-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." ↵Deepanshu Gupta2015-01-081-4/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev automerge: 0b1188e * commit 'a98a9b30bea74478b9d1b3f16e3713f5c864e648': Fix tests on jenkins, take 2.
| * | | | | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | automerge: 0b1188e * commit '0b1188e3c1ff6c814dc64c51c83b19afa36d8ce9': Fix tests on jenkins, take 2.
| | * | | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | * commit '3bd33f1d9e8af826fa95095ca391d40f6c75ca2a': Fix tests on jenkins, take 2.
| | | * | | | | Fix tests on jenkins, take 2.Deepanshu Gupta2015-01-071-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I67386c34a7abd7c3afdf9f0768f36f4786399be0
* | | | | | | | am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests on jenkinsDeepanshu Gupta2015-01-071-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fa490b78df732f484475e214eec033f89c5b40b7': Fix tests on jenkins
| * | | | | | | am 7f9582ce: am 48603a39: Fix tests on jenkinsDeepanshu Gupta2015-01-071-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '7f9582ce616a81b70794d7942b39f8442f5ef9d5': Fix tests on jenkins
| | * | | | | | am 48603a39: Fix tests on jenkinsDeepanshu Gupta2015-01-071-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '48603a39d4dd721d231c99e10908f4f00c4ec6b9': Fix tests on jenkins
| | | * | | | | Fix tests on jenkinsDeepanshu Gupta2015-01-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into ↵Deepanshu Gupta2015-01-061-1/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev-plus-aosp
| * | | | | | | | resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp againDeepanshu Gupta2015-01-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The earlier resolution (a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2) wasn't the right one. This fixes it. Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98
* | | | | | | | | am aebd7fdb: am 565f2245: am a6671b70: am 6461e054: Merge "Add image ↵Deepanshu Gupta2015-01-063-0/+343
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | comparison to LayoutLib tests." into lmp-dev * commit 'aebd7fdb66b41b77a3cf51a7cf6911e8db3c7199': Add image comparison to LayoutLib tests.
| * | | | | | | am a6671b70: am 6461e054: Merge "Add image comparison to LayoutLib tests." ↵Deepanshu Gupta2015-01-063-0/+343
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'a6671b707446963f402a71219725f317a57b42af': Add image comparison to LayoutLib tests.
| | * | | | | | am 6461e054: Merge "Add image comparison to LayoutLib tests." into lmp-devDeepanshu Gupta2015-01-053-0/+343
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '6461e05420c6f42b0e70134a4e0d2a626161ab74': Add image comparison to LayoutLib tests.
| | | * | | | | Add image comparison to LayoutLib tests.Deepanshu Gupta2015-01-053-0/+343
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | resolved conflicts for merge of 8c831b2f to lmp-mr1-dev-plus-aospDeepanshu Gupta2015-01-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: I8894287fd43afc863d070cab04cfaa1bf70f7ebb
| * | | | | | | am 0db2524c: am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-devDeepanshu Gupta2015-01-061-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '0db2524caa01022629075a113d3370a1b7c3da30': Remove Time from CreateInfo
generated by cgit v1.1 at 2025-02-13 17:52:38 +0000