summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib
Commit message (Collapse)AuthorAgeFilesLines
* Split up android.policy into framework.jar and services.jar 1/3Jorim Jaggi2015-02-102-73/+0
| | | | Change-Id: Ifd69f1f3dd308a7e17a1442e2f3950da8b03cec4
* am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: ↵Deepanshu Gupta2015-01-315-124/+452
|\ | | | | | | | | | | | | | | | | 7789447 automerge: 580937f automerge: c053438 automerge: df5a198 * commit 'df5a1987108539c703477adff3749d647ba313c5': Limited AppCompat support
| * am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: ↵Deepanshu Gupta2015-01-315-124/+452
| |\ | | | | | | | | | | | | | | | | | | | | | | | | 7789447 automerge: 580937f automerge: c053438 * commit 'c05343828611ed0b82fae4edf7fe11e0e9087db1': Limited AppCompat support
| | * am 3d5535cf: Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | automerge: 7789447 * commit '7789447bd97c851b7a09623a417300590e5439d5': Limited AppCompat support
| | | * am 3d5535cf: Merge "Limited AppCompat support" into lmp-devDeepanshu Gupta2015-01-315-124/+452
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '3d5535cfb7755c20619529649b025c4682013b85': Limited AppCompat support
| | | | * Limited AppCompat supportDeepanshu Gupta2015-01-285-124/+452
| | | | | | | | | | | | | | | | | | | | Change-Id: I4ac7234c9533b9f47f070335c4cb6ae605d8a89f
* | | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: ↵Deepanshu Gupta2015-01-312-8/+24
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e683bd automerge: 1575ca6 automerge: 862cdd6 automerge: 6a43990 * commit '6a439908fcc103696dd90bc42494231b54b7a10b': Resource resolution fixes.
| * | | | am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: ↵Deepanshu Gupta2015-01-312-8/+24
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e683bd automerge: 1575ca6 automerge: 862cdd6 * commit '862cdd6f11490c060842599a58a400e284c937d9': Resource resolution fixes.
| | * | | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 7e683bd * commit '7e683bdaddff77a24a36d420c5782b47795c5ccb': Resource resolution fixes.
| | | * | am 1d59871e: Merge "Resource resolution fixes." into lmp-devDeepanshu Gupta2015-01-312-8/+24
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | * commit '1d59871e4e8a3a657dab3931d684706c45630a2f': Resource resolution fixes.
| | | | * Resource resolution fixes.Deepanshu Gupta2015-01-152-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Remove TYPE_UNIVERSE_BACKGROUND from systemCraig Mautner2015-01-271-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An experiment that is over and has been occupying space. Fixes bug 18088522 item #7 Change-Id: Ib0fcaa24243ed9b0581143e1d5114c1fd2b0aa6e
* | | | | Eliminate groupId and add task to AppWindowTokenCraig Mautner2015-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplifies access by eliminating indirect referencing. Fixes bug 18088522 item #15. Change-Id: I9049192a7f3e1028d60c4f2d4d4a0d4aad590aa4
* | | | | 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 automerge: 2223018 * commit '22230189be8e811881ba24de1cde97f9882a7d45': Special case AppCompat to show action bar.
| * | | | 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.
| | | | | | * Special case AppCompat to show action bar.Deepanshu Gupta2015-01-101-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b.android.com/78944 Change-Id: I02d68d592d812016744716f99376cfefd519b21b
| | | | | | * 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
| | | | | | * 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)
| | | | | | * | 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)
| | | | | | * 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 321bf433: am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" ↵Deepanshu Gupta2015-01-083-2/+68
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev automerge: 03c822a * commit '321bf43315ace2f091a54d514dd56902990bec7a': Replace java.util.LinkedHashMap.eldest()
| * | | | | | 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 f0da92bf: am 169c11dd: Merge "Add missing DateFormat method." into ↵Deepanshu Gupta2015-01-081-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 33b2de7 * commit 'f0da92bfda9a7b393cac87436173c1284c7d48be': Add missing DateFormat method.
| * | | | | | | 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 f45420d0: am 565b6b41: Merge "Update platform.dir search in tests." into ↵Deepanshu Gupta2015-01-081-2/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev automerge: 7e39385 * commit 'f45420d0bd912de3da9506bbae12a0e4b789bd84': Update platform.dir search in tests.
| * | | | | | | 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 5df729ad: am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on ↵Deepanshu Gupta2015-01-081-4/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jenkins, take 2." into lmp-dev automerge: 0b1188e * commit '5df729ad09b85cb68bdf37d58c5d429c2c8663a4': Fix tests on jenkins, take 2.
| * | | | | | | 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 2458f2b1: am fa490b78: am 984823f5: am 7f9582ce: am 48603a39: Fix tests ↵Deepanshu Gupta2015-01-071-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on jenkins * commit '2458f2b12b5ec266538b2019b0f14fca4e772bdf': Fix tests on jenkins
| * | | | | | 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
* | | | | | | am 27ce2763: Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp ↵Deepanshu Gupta2015-01-071-1/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | again" into lmp-mr1-dev-plus-aosp * commit '27ce2763325bcb7940232a11892e12fb86053cf7': resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again
generated by cgit v1.1 at 2025-11-26 10:28:13 +0000