summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | am b2ebb968: Merge "Remove Time from CreateInfo" into lmp-devDeepanshu Gupta2015-01-051-1/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b2ebb9683fb5b21543b50772a0d4c646ced7764b': Remove Time from CreateInfo
| | | * | | | | Remove Time from CreateInfoDeepanshu Gupta2015-01-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am c2e9875d: am 229ce665: am 937db7a3: am 53f73a97: Merge "Add DatePicker, ↵Deepanshu Gupta2015-01-062-2/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CalendarView to LayoutLib tests" into lmp-dev * commit 'c2e9875dcb173a4965b5c0e6022fc2e81f0a37ef': Add DatePicker, CalendarView to LayoutLib tests
| * | | | | | | am 937db7a3: am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib ↵Deepanshu Gupta2015-01-062-2/+12
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests" into lmp-dev * commit '937db7a39ef6f5e88a936f78a729f9578123e60b': Add DatePicker, CalendarView to LayoutLib tests
| | * | | | | | am 53f73a97: Merge "Add DatePicker, CalendarView to LayoutLib tests" into ↵Deepanshu Gupta2015-01-052-2/+12
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-dev * commit '53f73a97542c277a519b973060dfa217849b66de': Add DatePicker, CalendarView to LayoutLib tests
| | | * | | | | Add DatePicker, CalendarView to LayoutLib testsDeepanshu Gupta2015-01-022-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice8c41ff90ccb0ffe90fcbfcccc91ea24225a3d9
* | | | | | | | am 84097e39: am b187106c: am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker ↵Deepanshu Gupta2015-01-061-10/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rendering." into lmp-dev * commit '84097e3977c82554aafc2e461cd51d6f5eb03866': Fix DatePicker rendering.
| * | | | | | | am e69e4f8b: am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-devDeepanshu Gupta2015-01-061-10/+18
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e69e4f8b4db142f024e170cf6faabb36095799b7': Fix DatePicker rendering.
| | * | | | | | am f9bb0b5e: Merge "Fix DatePicker rendering." into lmp-devDeepanshu Gupta2015-01-051-10/+18
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f9bb0b5e133b0c364c3f87623f0fdff0fedc5226': Fix DatePicker rendering.
| | | * | | | | Fix DatePicker rendering.Deepanshu Gupta2014-12-291-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am c7fe9793: am 48ab6bec: am 8c686ddd: am d20a518c: Merge "Make ↵Deepanshu Gupta2015-01-064-29/+36
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preference-cookie map non static." into lmp-dev * commit 'c7fe979303eb924d7fbb9fa342cc5cd7b929c2d2': Make Preference-cookie map non static.
| * | | | | | | am 8c686ddd: am d20a518c: Merge "Make Preference-cookie map non static." ↵Deepanshu Gupta2015-01-064-29/+36
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '8c686ddd540f3a15cdba4893f104c0e8e9af5716': Make Preference-cookie map non static.
| | * | | | | | am d20a518c: Merge "Make Preference-cookie map non static." into lmp-devDeepanshu Gupta2015-01-054-29/+36
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd20a518c82e5e33d33e3dc5d74bf3c17d807f7d7': Make Preference-cookie map non static.
| | | * | | | | Make Preference-cookie map non static.Deepanshu Gupta2014-12-234-29/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | am addaeff9: am b88a65df: am cec8e5a1: am f861c0ce: Merge "Fix default ↵Deepanshu Gupta2015-01-064-9/+144
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial value for preferences" into lmp-dev * commit 'addaeff9b28d833616376f802b7a38e32397edd1': Fix default initial value for preferences
| * | | | | | | am cec8e5a1: am f861c0ce: Merge "Fix default initial value for preferences" ↵Deepanshu Gupta2015-01-064-9/+144
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit 'cec8e5a10de413c733223b8b1cc11b70c6254647': Fix default initial value for preferences
| | * | | | | | am f861c0ce: Merge "Fix default initial value for preferences" into lmp-devDeepanshu Gupta2015-01-054-9/+144
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f861c0ce3ff42550f3d5ede837e7bfb3855f5964': Fix default initial value for preferences
| | | * | | | | Fix default initial value for preferencesDeepanshu Gupta2014-12-234-9/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NO_SQ: Depends on unsubmitted changes. Change-Id: I061cf71f6167d382e9ef060abeb4d5cff83c4104
* | | | | | | | am e15f580b: am 2bd01ebf: am 7ed14549: am 7081a114: Merge "Add preferences ↵Deepanshu Gupta2015-01-068-34/+224
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rendering." into lmp-dev * commit 'e15f580b9d7a555bff96efd3cec195b39637e679': Add preferences rendering.
| * | | | | | | am 7ed14549: am 7081a114: Merge "Add preferences rendering." into lmp-devDeepanshu Gupta2015-01-068-34/+224
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ed145493d3f5bea32c567980f77cc42f613197e': Add preferences rendering.
| | * | | | | | am 7081a114: Merge "Add preferences rendering." into lmp-devDeepanshu Gupta2015-01-058-34/+224
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '7081a114d4ee190c746f337057b0f84928c162dd': Add preferences rendering.
| | | * | | | | Add preferences rendering.Deepanshu Gupta2014-12-238-34/+224
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NO_SQ: Depends on updating layoutlib-api-prebuilt.jar Change-Id: Iae93ab74c478e6f2158e1528467bec9ee2d7ee9b
* | | | | | | | am 9c8f8ed8: am 4a5baeae: Merge "resolved conflicts for a0bc2e7e to ↵Deepanshu Gupta2015-01-052-0/+45
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev" into lmp-mr1-dev * commit '9c8f8ed8a8bee42ee48a27b055b11ace6255d09a': resolved conflicts for a0bc2e7e to lmp-mr1-dev
| * | | | | | | resolved conflicts for a0bc2e7e to lmp-mr1-devDeepanshu Gupta2014-12-302-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original change wasn't properly merged into lmp-mr1-dev because of merge conflicts. This change manually resolves the conflicts. The main reason for the conflict was that TimePickerSpinnerDelegate was swapped with TimePickerClockDelegate. This change also fixes the typo in the original change which was fixed in a subsequent change. Original commit: 12b6d29b7b5592dcfb6e6fd6f0c21a40f37d014a fix for typo: cb09bc45c58740af953874f9915306d351fc3d9d Change-Id: I50bf8c2d86318f632465a38adfad16d1382a9319
* | | | | | | | am 503a4494: am f1f179a7: Merge "AAPT: Copy android:revisionCode to Splits" ↵Adam Lesinski2014-12-162-0/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit '503a4494d64d30f9b904b24a56fff986810da610': AAPT: Copy android:revisionCode to Splits
| * | | | | | | Merge "AAPT: Copy android:revisionCode to Splits" into lmp-mr1-devAdam Lesinski2014-12-162-0/+16
| |\ \ \ \ \ \ \
| | * | | | | | | AAPT: Copy android:revisionCode to SplitsAdam Lesinski2014-12-162-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:18706179 Change-Id: I669b56e0b67dd1bfda7749ef433b55af16851154
* | | | | | | | | am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would ↵Adam Lesinski2014-12-161-25/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | be removed for pre-21 devices" into lmp-mr1-dev automerge: 465d123 * commit '465d123464eadf180b618164b2ed23702bca3d86': AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
| * | | | | | | | Merge "AAPT: attributes showing up after v21 attributes would be removed for ↵Adam Lesinski2014-12-151-25/+17
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pre-21 devices" into lmp-mr1-dev
| | * | | | | | | | AAPT: attributes showing up after v21 attributes would be removed for pre-21 ↵Adam Lesinski2014-12-101-25/+17
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | devices There was an inconsistency in the indexing when removing attributes in layouts. Now we account for that shift that happens when you delete an attribute. Bug:18707321 Change-Id: I656eee3fb614168fa8ceeff379e8594708961dad
* | | | | | | | | am c765655a: am fbba9b57: Merge "AAPT: Dump status of required flag for ↵Adam Lesinski2014-12-091-5/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uses-feature" into lmp-mr1-dev * commit 'c765655ae1ae35f9d5f0958295f0b71270132ca7': AAPT: Dump status of required flag for uses-feature
| * | | | | | | | AAPT: Dump status of required flag for uses-featureAdam Lesinski2014-12-081-5/+3
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Outside of a feature-group, the legacy uses-feature tag has a boolean required flag that should be emitted in dump badging. Bug:17790999 Change-Id: I43023af00e9c9ed4bc35795c3a983fc719bf9b7a
* | | | | | | | Merge commit '0953ab27' into manualmergeAdam Lesinski2014-12-052-22/+164
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: I36dea45f7571096136ea7bda5e2680bd85a0df32
| * | | | | | | Merge "AAPT: Move private attrs to new type for framework" into lmp-mr1-devAdam Lesinski2014-12-042-22/+161
| |\ \ \ \ \ \ \
| | * | | | | | | AAPT: Move private attrs to new type for frameworkAdam Lesinski2014-12-032-22/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private attributes are typically placed after public attributes in the resource table. Each time a new version of the Android framework is released, new public attributes take the place of the private attributes, and the private attributes are shifted after the new public ones. This means that any apps built against the newer SDK may inadvertently be using private attributes on older devices. This change moves all private attributes to a completely different type ID, so there will never be collisions across versions. These private attributes are automatically moved to a synthesized type only for the system resources. Bug:18263655 Change-Id: I7a850512953fadcc9f3524d509cea30249782db8
* | | | | | | | | am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that ↵Deepanshu Gupta2014-12-042-38/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RandomAccessFile is not leaked." into lmp-dev * commit '43d0e67573e8122d9e75accb00eaa453e2755713': Ensure that RandomAccessFile is not leaked.
| * | | | | | | | am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not ↵Deepanshu Gupta2014-12-042-38/+34
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | leaked." into lmp-dev * commit '6cbef4bd3e1f16647ab01dc29df9a357d54a85de': Ensure that RandomAccessFile is not leaked.
| | * | | | | | | am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-devDeepanshu Gupta2014-12-032-38/+34
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | * commit '03af0c42d80734c44198b96a99488bb94816ae97': Ensure that RandomAccessFile is not leaked.
| | | * | | | | | Ensure that RandomAccessFile is not leaked.Deepanshu Gupta2014-12-022-38/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change ensures that RandomAccessFile is always closed. Also, it changes the BufferIterator implementation to delegate to the byte buffer directly instead of mainitaining the position itself. Change-Id: I8f93e80c91a7c35e6a7fb015185b8b11e36b6286
* | | | | | | | | am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock ↵Deepanshu Gupta2014-12-0410-108/+333
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rendering" into lmp-dev * commit '52a60ff6366a4f5cf1ed9697b7cebd6f9300de2b': Fix AnalogClock rendering
| * | | | | | | | am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-devDeepanshu Gupta2014-12-0410-108/+333
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4628d51a0d01641ca7fe2cf8403ad551ea6f50ce': Fix AnalogClock rendering
| | * | | | | | | am 141c7614: Merge "Fix AnalogClock rendering" into lmp-devDeepanshu Gupta2014-12-0310-108/+333
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '141c7614fdef45d1a95ccb325da762a79412aae2': Fix AnalogClock rendering
| | | * | | | | | Fix AnalogClock renderingDeepanshu Gupta2014-11-2610-108/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Change calls to java.lang.System.log* since they don't exist on the host. 2. Clean up method rewrite mechanism in ReplaceMethodCallsAdapter. 3. Stub out creation of uninitialized GregorianCalendar. 4. Memory map the time zone data base file and provide a custom implementation of BufferIterator for use by ZoneInfoDB 5. Delete unused Time_Delegate Also fixed a comment in BridgeAssetManager and an error message in FontFamily_Delegate. Bug: http://b.android.com/79160 Change-Id: Iae5ef65678f0e6c7c5af520c45bd15980ce3fa55
* | | | | | | | | am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to ↵Deepanshu Gupta2014-12-041-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev" into lmp-mr1-dev * commit 'c16d1448bb139384cc86d14d9412ffe1a62817c8': Fix typos in previous bugfixes.
| * | | | | | | | resolved conflicts for merge of fb30a783 to lmp-mr1-devDeepanshu Gupta2014-12-041-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | Change-Id: I91fdb76c748b97376d6469c8d1198a15c4395463
| | * | | | | | | am 7e55c292: Merge "Fix typos in previous bugfixes." into lmp-devDeepanshu Gupta2014-12-032-2/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7e55c29281f8a62154451e87b45d95ec5f97c5ac': Fix typos in previous bugfixes.
| | | * | | | | | Fix typos in previous bugfixes.Deepanshu Gupta2014-11-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The commits 2c9fbdd and 12b6d29 introduced minor bugs. This change fixes them.
* | | | | | | | | am 72a6aeac: am 91ca64ea: Merge "AAPT: Add pathMotion custom classes to ↵Adam Lesinski2014-12-031-6/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proguard Keep set" into lmp-mr1-dev * commit '72a6aeaca0712d9b72b9f773e2b72bb45ddd3cb8': AAPT: Add pathMotion custom classes to Proguard Keep set
| * | | | | | | | AAPT: Add pathMotion custom classes to Proguard Keep setAdam Lesinski2014-12-021-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:18590044 Change-Id: Ia5dbf55317d2cc89826316e8d10f031b5d340e57
* | | | | | | | | am f17611a2: am 130e30fe: Merge "AAPT: Add custom transition classes to ↵Adam Lesinski2014-12-031-0/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Proguard keep set" into lmp-mr1-dev * commit 'f17611a29e3b0d0c7a5d28a1ce92682a2c097de6': AAPT: Add custom transition classes to Proguard keep set
generated by cgit v1.1 at 2025-02-15 21:13:58 +0000