summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am b6f3708d: am 1044a1dc: Merge "Update delegate methods in layoutlib." into ↵Xavier Ducrohet2013-11-265-89/+25
|\ | | | | | | | | | | | | klp-dev * commit 'b6f3708d330872232a6a57a1a5c0d2243fd7419e': Update delegate methods in layoutlib.
| * Update delegate methods in layoutlib.Deepanshu Gupta2013-11-255-89/+25
| | | | | | | | Change-Id: I1f0fc274b6a74dbcf0ed46175c4a2fa4c2dd9a63
* | am 5a0fd1fd: am 9d5a9434: Merge "Update ICU_Delegate methods. DO NOT MERGE" ↵Deepanshu Gupta2013-11-181-2/+2
|\ \ | |/ | | | | | | | | | | into klp-dev * commit '5a0fd1fd0fb5d734bf65d26e56e413dba2821b07': Update ICU_Delegate methods. DO NOT MERGE
| * Update ICU_Delegate methods. DO NOT MERGEDeepanshu Gupta2013-11-181-2/+2
| | | | | | | | | | Bug: 11435966 Change-Id: Ib8ed2011fe62b2496795075b33b9ca7d5907b87a
* | am ea04da7a: am 9570ed56: Merge "Add libphonenumber to layoutlib.jar. DO NOT ↵Deepanshu Gupta2013-11-182-1/+7
|\ \ | |/ | | | | | | | | | | MERGE" into klp-dev * commit 'ea04da7a183b526cdc79366822e4fc794d28cbd2': Add libphonenumber to layoutlib.jar. DO NOT MERGE
| * Add libphonenumber to layoutlib.jar. DO NOT MERGEDeepanshu Gupta2013-11-132-1/+7
| | | | | | | | | | Issue: http://b.android.com/59497 Change-Id: Ief11e602703b6041db66241f1699cc1de72e65a5
* | am 42453ede: am 599105a9: Merge "Fix NPE in layoutlib. DO NOT MERGE" into ↵Deepanshu Gupta2013-11-181-1/+0
|\ \ | |/ | | | | | | | | | | klp-dev * commit '42453ede3335aa5f7007a5b36749e84df83a08d4': Fix NPE in layoutlib. DO NOT MERGE
| * Fix NPE in layoutlib. DO NOT MERGEDeepanshu Gupta2013-11-131-1/+0
| | | | | | | | Change-Id: I36623304d83b344ea078044001577b8005a63c02
* | am 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. ↵Deepanshu Gupta2013-11-131-1/+2
|\ \ | |/ | | | | | | | | | | DO NOT MERGE * commit '6870d29c340008919dcd9e547236b74301b3b9ef': Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
| * Update changed delegate method in Bitmap_Delegate. DO NOT MERGEDeepanshu Gupta2013-11-131-1/+2
| | | | | | | | | | Issue: https://code.google.com/p/android/issues/detail?id=60167 Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005
* | am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own ↵Craig Mautner2013-11-121-1/+1
|\ \ | |/ | | | | | | | | | | config change." into klp-dev * commit '679ba4e86e4fecb6dbfe48d6c49205c32f995a1c': Relayout windows that handle their own config change.
| * Relayout windows that handle their own config change.Craig Mautner2013-11-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a window claims to handle its own configuration change then we won't destroy and recreate its window on a configuration change. Normally that recreation triggers the first layout following orientation change because mHaveFrame is false. Windows that handle their own configuration changes never got a relayout pass following a change in orientation. This change passes the configuration changes that an application handles into the AppWindowToken. If the app says it handles orientation or screen size changes then a relayout will occur when the configuration has changed. Fixes bug 11647107. Change-Id: Ie8d49fd050442ebbdcf0b805087894e3a2fc4be9
* | am 76b715e5: am e45d8b2d: Merge "Fix text size in Fake Action Bar" into klp-devDeepanshu Gupta2013-11-101-1/+1
|\ \ | |/ | | | | | | * commit '76b715e556a110d4aa1fec0d4de195e18def8295': Fix text size in Fake Action Bar
| * Fix text size in Fake Action BarDeepanshu Gupta2013-11-081-1/+1
| | | | | | | | | | | | | | | | The density multiplier was being applied twice to the title text in the fake action bar. Bug: 11436018 Change-Id: Id74c11037cb43d01f6cd79126623c84edfc37aaf
* | am 8f592378: am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-293-40/+40
|\ \ | | | | | | | | | | | | * commit '8f592378a1ea7f31d57253dc202f42707ef4da36': Fix a variety of small publicly-reported bugs.
| * \ am 69920427: Merge "Fix a variety of small publicly-reported bugs."Elliott Hughes2013-10-293-40/+40
| |\ \ | | | | | | | | | | | | | | | | * commit '69920427ea01421d34f3a7576bdd135527b20859': Fix a variety of small publicly-reported bugs.
| | * | Fix a variety of small publicly-reported bugs.Elliott Hughes2013-10-293-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Possible NULL dereference in cmds/bootanimation/BootAnimation.cpp. https://code.google.com/p/android/issues/detail?id=61556 Missing fclose in core/jni/android_os_Debug.cpp. https://code.google.com/p/android/issues/detail?id=61546 Bad loop guards in core/jni/android_util_Process.cpp. https://code.google.com/p/android/issues/detail?id=61557 Assignment to wrong variable in libs/androidfw/AssetManager.cpp. https://code.google.com/p/android/issues/detail?id=61560 Missing delete[]s in libs/androidfw/ObbFile.cpp. https://code.google.com/p/android/issues/detail?id=61549 Leaks on error in tools/aapt/Images.cpp. https://code.google.com/p/android/issues/detail?id=61552 Two missing fclose calls in tools/aapt/Resource.cpp. https://code.google.com/p/android/issues/detail?id=61553 Missing fclose in tools/aidl/aidl.cpp. https://code.google.com/p/android/issues/detail?id=61554 Change-Id: I5820f3824e72d07a9acb776cf0af3e7443f5694a
* | | | am d19385bf: am 21657181: Merge "Add a method to set a list of uids for a ↵Marco Nelissen2013-10-251-0/+5
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | wake lock" into klp-dev * commit 'd19385bf58225069c8ea0a7ce5075ed28861b039': Add a method to set a list of uids for a wake lock
| * | | Add a method to set a list of uids for a wake lockMarco Nelissen2013-10-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherrypicked from master. b/9464621 Change-Id: Ia6a9d36d55129ae87d3ec070fbf10dc02f4b6cb4
* | | | am 16e8c4f7: am 7d292145: Merge "Prune unneeded density resources from APK" ↵Adam Lesinski2013-10-181-1/+38
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '16e8c4f7db87d743410751410c7f761350792fe2': Prune unneeded density resources from APK
| * | | Merge "Prune unneeded density resources from APK" into klp-devAdam Lesinski2013-10-181-1/+38
| |\ \ \
| | * | | Prune unneeded density resources from APKAdam Lesinski2013-10-151-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a preferred density is specified, prune all but the closest matching density when the exact density resource does not exist. If a preferred density resource does not exist and a higher density resource exists, prune all but the resource with the next highest density relative to the preferred density. If a preferred density resource does not exist and there is no higher density resource, prune all but the resource with the next lowest density relative to the preferred density. bug:11224465 Change-Id: I99b3950fe3d8116a5625968ed383442315ae8526
* | | | | am 5a6541eb: am b4f33d8f: Merge "Layoutlib Create: Remove references to java ↵Deepanshu Gupta2013-10-183-3/+138
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | package class Objects." into klp-dev * commit '5a6541ebc787c5a54e89c0bf65f029660778736a': Layoutlib Create: Remove references to java package class Objects.
| * | | | Layoutlib Create: Remove references to java package class Objects.Deepanshu Gupta2013-10-173-3/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove references to Java 7 class java.util.Objects and replace it with a new class that can be loaded on Java 6. Change-Id: Ibbd9b20b8bc89e247f1d0c48d743d06d1a4f0704
* | | | | am ddc069cb: am 6c3a638d: Merge "Fix layoutlib for KK" into klp-devDeepanshu Gupta2013-10-174-15/+50
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'ddc069cbb0a7edd289f4920ab42dca7e8111a359': Fix layoutlib for KK
| * | | | Merge "Fix layoutlib for KK" into klp-devDeepanshu Gupta2013-10-184-15/+50
| |\ \ \ \
| | * | | | Fix layoutlib for KKDeepanshu Gupta2013-10-164-15/+50
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a NPE, update the native methods for NinePatch and update an ICU method to return the right value as required by DatePicker widget. Bug: 11140701 Change-Id: Id92fc5359acf6dde1bcdbc781aaf637fdb6eecbf
* | | | | am e1abede3: am 29cf698d: Merge "Layoutlib: Add DateIntervalFormat_Delegate ↵Deepanshu Gupta2013-10-172-0/+71
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | required by CalendarView" into klp-dev * commit 'e1abede32fc913098b7c449e3369eb1d5bda77e2': Layoutlib: Add DateIntervalFormat_Delegate required by CalendarView
| * | | | Layoutlib: Add DateIntervalFormat_Delegate required by CalendarViewDeepanshu Gupta2013-10-172-0/+71
| | | | | | | | | | | | | | | | | | | | Change-Id: Ica79267a4eb231db833cb0232cfacf419fe73de3
* | | | | am 0b447eb8: am 4fc655dd: am 873c76d0: am fb1ee08c: am a49c3585: Merge "Fix ↵Deepanshu Gupta2013-10-172-0/+62
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | CalendarView to show the right month and year label." into jb-mr2-dev * commit '0b447eb8c68769333228791d077e1bdf8779f22f': Fix CalendarView to show the right month and year label.
| * | | | am 873c76d0: am fb1ee08c: am a49c3585: Merge "Fix CalendarView to show the ↵Deepanshu Gupta2013-10-172-0/+62
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | right month and year label." into jb-mr2-dev * commit '873c76d0475def6f89fe02458828a549a7a7b5a2': Fix CalendarView to show the right month and year label.
| | * \ \ \ am fb1ee08c: am a49c3585: Merge "Fix CalendarView to show the right month ↵Deepanshu Gupta2013-10-172-0/+62
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and year label." into jb-mr2-dev * commit 'fb1ee08ca4424969c148760937d18ec0e3de206c': Fix CalendarView to show the right month and year label.
| | | * \ \ \ Merge "Fix CalendarView to show the right month and year label." into jb-mr2-devDeepanshu Gupta2013-10-172-0/+62
| | | |\ \ \ \
| | | | * | | | Fix CalendarView to show the right month and year label.Deepanshu Gupta2013-10-162-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I95431f1054678d4192bd1621c1f69b29268f55e9
* | | | | | | | am c9f65589: am 38d097b6: am 92a80b18: am 9b827a7d: am ec555902: Merge ↵Deepanshu Gupta2013-10-178-7/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-dev * commit 'c9f65589a98ae348d2d31296bda4d739e8515335': Layoutlib: Update the wifi icon in the status bar.
| * | | | | | | am 92a80b18: am 9b827a7d: am ec555902: Merge "Layoutlib: Update the wifi ↵Deepanshu Gupta2013-10-178-7/+6
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | icon in the status bar." into jb-mr2-dev * commit '92a80b1830082d109be4902c357424535305130d': Layoutlib: Update the wifi icon in the status bar.
| | * | | | | | am 9b827a7d: am ec555902: Merge "Layoutlib: Update the wifi icon in the ↵Deepanshu Gupta2013-10-178-7/+6
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | status bar." into jb-mr2-dev * commit '9b827a7d6dcb8c60411a24e2c8970f3fc24f0380': Layoutlib: Update the wifi icon in the status bar.
| | | * | | | | Merge "Layoutlib: Update the wifi icon in the status bar." into jb-mr2-devDeepanshu Gupta2013-10-178-7/+6
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Layoutlib: Update the wifi icon in the status bar.Deepanshu Gupta2013-10-148-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: https://code.google.com/p/android/issues/detail?id=60993 Change-Id: Ia43ed40b42c79f67dcd5809b827d4fecbc823c25
* | | | | | | | am 4567ec02: am ca429e08: am 9568ad39: am 94e5ada7: am 81f74f4b: Fix ↵Deepanshu Gupta2013-10-171-2/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DatePicker and Calendar widget in layoutlib. * commit '4567ec02c468423351c56bcc587032577004735d': Fix DatePicker and Calendar widget in layoutlib.
| * | | | | | | am 9568ad39: am 94e5ada7: am 81f74f4b: Fix DatePicker and Calendar widget in ↵Deepanshu Gupta2013-10-171-2/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | layoutlib. * commit '9568ad393194cbd42866e64dada88207b44462a6': Fix DatePicker and Calendar widget in layoutlib.
| | * | | | | | am 94e5ada7: am 81f74f4b: Fix DatePicker and Calendar widget in layoutlib.Deepanshu Gupta2013-10-171-2/+8
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '94e5ada7d629f125262fcc052cf15355a34a678a': Fix DatePicker and Calendar widget in layoutlib.
| | | * | | | | Fix DatePicker and Calendar widget in layoutlib.Deepanshu Gupta2013-10-161-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: https://code.google.com/p/android/issues/detail?id=59732 Change-Id: I281b3fdad88c591281a3645592c84f3e2cb61d09
* | | | | | | | am a30efb5b: am 198537c2: am 7dc35060: am df076962: am 1cf5df38: Layoutlib ↵Deepanshu Gupta2013-10-1726-443/+1669
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create: Remove references to non-std Java classes. * commit 'a30efb5b7034236020bcb1ef4787f1517f7995df': Layoutlib Create: Remove references to non-std Java classes.
| * | | | | | | am 7dc35060: am df076962: am 1cf5df38: Layoutlib Create: Remove references ↵Deepanshu Gupta2013-10-1726-443/+1669
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | to non-std Java classes. * commit '7dc35060a828c473dcc75d13d31edaa75768a40f': Layoutlib Create: Remove references to non-std Java classes.
| | * | | | | am df076962: am 1cf5df38: Layoutlib Create: Remove references to non-std ↵Deepanshu Gupta2013-10-1726-443/+1669
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Java classes. * commit 'df0769628e2bfcefb5f78375b74775b3a825ca9f': Layoutlib Create: Remove references to non-std Java classes.
| | | * | | | Layoutlib Create: Remove references to non-std Java classes.Deepanshu Gupta2013-10-1626-443/+1669
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not add the non-standard Java classes. Updates the references to all non-standard classes to new classes in com.android.tools.layoulib.create package. This also treats java.lang.AutoCloseable which is part of Java 7 similarly so that we can still run on Java 6. Change-Id: Iac5b272652e2780c9bb72d19f415d150948ca589
* | | | | | am 1bdbdfbe: am 6930d380: Merge "Ignore certain WindowManager flags when ↵Alan Viverette2013-10-071-0/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touch exploration is enabled" into klp-dev * commit '1bdbdfbe6a48113bff2069c8eaf9835f9fd8c9bb': Ignore certain WindowManager flags when touch exploration is enabled
| * | | | | Merge "Ignore certain WindowManager flags when touch exploration is enabled" ↵Alan Viverette2013-10-081-0/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into klp-dev
| | * | | | | Ignore certain WindowManager flags when touch exploration is enabledAlan Viverette2013-10-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifically, ignore any flags that alter the visibility of the navigation bar and transparency. BUG: 11082573 Change-Id: I17264dc55a1c6c3cb9b9cf92d5121799cecee5b8