summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'gingerbread' of ↵Steve Kondik2011-09-2912-207/+375
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.omapzoom.org/platform/frameworks/base into 237 Conflicts: core/java/android/app/ContextImpl.java core/java/android/bluetooth/BluetoothDeviceProfileState.java core/java/android/content/pm/IPackageManager.aidl core/res/res/values-de/strings.xml core/res/res/values-sk/strings.xml core/res/res/values-sv/strings.xml core/res/res/values-zh-rTW/strings.xml packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java services/java/com/android/server/NativeDaemonConnector.java services/java/com/android/server/PackageManagerService.java services/java/com/android/server/WifiService.java telephony/java/com/android/internal/telephony/gsm/GSMPhone.java tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeInflater.java tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeResources.java tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeTypedArray.java tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParser.java tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/CustomBar.java tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ResourceHelper.java tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/android/BridgeXmlBlockParserTest.java wifi/java/android/net/wifi/WifiStateTracker.java Change-Id: Ia721284ebd8ed7741ab55105d89f2e3f366604d7
| * Bring in more layout lib changes from hc-mr1.Xavier Ducrohet2011-06-1612-192/+322
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe051bb2 : Change the way the layoutlib instantiate its XmlPullParser. A lot of the init code was duplicated so I made a ParserFactory class. Also created an extension of the KXmlPullParser to override toString(). This allows easier debugging when dealing with multiple parsers (which is always the case). Also added some (disabled) debugging printf to deal with parser stack as it can be tricky figuring out which parsers are in the stack at which point. 8969147c : Fix case where the int[] attrs doesn't directly match a styleable. In the case of the FastScroller the int[] is a custom mix of attr instead of a int[] that exists as R.styleable.foo. This makes our reflection based mechanism used to find the styleable fail, so instead we search for each attribute separately (like we probably should have done from the beginning). 0c264b35: Fix various cases of getDimension to report error if unit is missing. if getDimention###() is called for a string that has no unit, then an error is output through LayoutLog, but the rendering keeps going by using dp as a default. 0beb7eea: Make (Bridge)TypedArray.getInteger() call out to getInt() Only getInt() resolved attribute flags/enum and I'm not sure why there's two to begin with. Change-Id: I015111263d2a2bee76834978ae71eef79defdae3
| * CherryPick 06942bc4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-162-4/+9
| | | | | | | | | | | | Layoutlib - use the new getParser callback when possible. Change-Id: I72b867aa573fcc07d610f139da3c90b1b654633c
| * CherryPick 988eeeb5 from hc-mr1. do not merge.Xavier Ducrohet2011-06-163-16/+49
| | | | | | | | | | | | Support for custom declare-styleable attr with enum/flag in layoutlib. Change-Id: I8a5b7cc629d61996ffade9aabd9d4d10961eb411
| * Cherrypick d1ed33c4 from hc-mr1. do not merge.Xavier Ducrohet2011-06-033-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix zombie threads in the Layoutlib. Some widgets can create (indirectly) HandlerThread which are started but never stopped. This patch use the delegate methods to override the thread run method to record which threads are started to be able to call quit() on them after a render. Note that we should really fix layoutlib_create to be able to call the default implementation from a delegate to remove code duplication. Change-Id: Iaf5432623e9704bb3114a8e0583c8553282c205e
| * Cherrypick 5b61ea6b from hc-mr1Xavier Ducrohet2011-06-031-1/+1
| | | | | | | | | | | | Fix drawCircle in layoutlib. Change-Id: I035c48b925cad246ed821e9e59a93d37174982ef
| * LayoutLib: enable the LAYOUT_ONLY capability.Xavier Ducrohet2011-06-021-1/+1
| | | | | | | | Change-Id: Ib302af47d2a83a7ac3def6256bf0b892823f594f
| * Merge dba35f1b from honeycomb-mr1. do not merge.Xavier Ducrohet2011-06-017-16/+13
| | | | | | | | | | Change-Id: Iebda5ea67fd40cac76a8ca3fe3c3cd4ee95ddebe LayoutLib: Properly configure KXmlParser to read UTF8
| * Merge 6103e22c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-241-53/+58
| | | | | | | | | | | | | | | | | | | | LayoutLib: custom styles override the default style instead of replacing it. Intead of reading either the custom or the default style for a widget, we read both and use the values from the custom style if it exists, or from the default style otherwise. Change-Id: Ibcec2e9b1e8a95295ab26ede145c287ff2f30be4
| * Merge 2402ad60 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-231-1/+1
| | | | | | | | | | | | LayoutLib: Fix Canvas_Delegate.native_concat(). Change-Id: I863c43d65a929816ac7c9e69addcc647dac1878b
| * Merge e57aa434 from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-203-32/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib: Fix issue where <include> with no layout params wouldn't display. The issue is that the layout params from the root element of the included layout should be used but this failed because loading the layout params from the <include> tag didn't throw a RuntimeException in our modified code (BridgeTypedArray). Because we don't want to throw exception in general we only throw it when reading the layout params of an include node which is pretty crappy, but works for now. Change-Id: I83ccf956e8b476f34dfc9a70aebae2288d53746e
| * Merge 05b7b69c from honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-193-22/+33
| | | | | | | | | | Change-Id: I1aca5774dec2e18ab5f9e860f6fd90b481b2857c LayoutLib: support the new baseline/margin query API.
| * Merge 2fae858d from Honeycomb-mr1. do not merge.Xavier Ducrohet2011-05-1911-51/+799
| | | | | | | | | | Change-Id: I648f9ffa9745331ce4104dc4772f78ed933a4909 LayoutLib: implement data binding for most AdapterView
* | telephony: MccTable: Updates for worldwide needsLadios Jonquil2011-08-191-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Spare 2 bits from country code to language code 7 bits for each character of country code would be enough. LANG_STRINGS[]'s max index is now increased to 63 (from 15). FYI, there are at least 3 dozens of languages in frameworks. * Lookup country's primary time zone from xml There are hundreds of time zones. Import all of them into MccTable wouldn't be a good idea. Now it gets the time zone ID from com.android.internal.R.xml.time_zones_by_country for MCCs without time zone assigned. As I see, the first entry matched in the xml would be the primary time zone for the specified country. We only need to assign time zones for countries that have more than one MCC and its time zone. * Add a script to update MccTable.java automatically By executing tools/genmcctable, any changes to mcc_table in Python code will be updated to the auto generated section of Java code. * Minor Changes - Fix indent of Java comment generated by Python - Set Chinese as the default language of Taiwan Change-Id: I8724d9e8d5b733a91d5ec9f42ff33b17c9d23eb0
* | Merge branch 'gingerbread' of ↵Steve Kondik2011-07-2620-165/+1052
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git://android.git.kernel.org/platform/frameworks/base into upstream-2.3.5 Conflicts: core/java/android/content/pm/IPackageManager.aidl core/java/android/server/BluetoothService.java packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java services/java/com/android/server/PackageManagerService.java telephony/java/com/android/internal/telephony/gsm/GSMPhone.java wifi/java/android/net/wifi/WifiStateTracker.java Change-Id: I254bd490297376ae8070fffcb07d4fe15afe3a8d
* | Normalize output of XMLtree contentShachar Shemesh2011-05-061-1/+2
| | | | | | | | | | | | | | | | Make the output from aapt dump xmltree normalized, so that it is unambigously displayed regardless of the content of the strings. Previous patch left out handling of XML element content. Change-Id: Ib8016996c769f3dde7a87f7ecbdf850333f2426a
* | Merge branch 'gingerbread' of ↵Steve Kondik2011-04-30134-8364/+16607
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://android.git.kernel.org/platform/frameworks/base into 34 Conflicts: core/java/android/net/ConnectivityManager.java core/java/android/net/NetworkStateTracker.java core/java/android/net/http/AndroidHttpClient.java core/java/android/provider/Settings.java core/java/com/android/internal/os/ZygoteInit.java core/java/com/google/android/mms/pdu/PduParser.java core/jni/android_net_NetUtils.cpp core/res/AndroidManifest.xml core/res/res/values-de/strings.xml core/res/res/values-es/strings.xml core/res/res/values-it/strings.xml core/res/res/values-pt/strings.xml core/res/res/values-ru/strings.xml core/res/res/values-uk/strings.xml core/res/res/values-zh-rCN/strings.xml core/res/res/values-zh-rTW/strings.xml core/res/res/values/config.xml core/res/res/values/strings.xml data/fonts/DroidSans-Bold.ttf data/fonts/DroidSans.ttf data/fonts/DroidSansArabic.ttf data/fonts/DroidSansMono.ttf data/fonts/DroidSerif-Bold.ttf data/fonts/DroidSerif-BoldItalic.ttf data/fonts/DroidSerif-Italic.ttf libs/ui/InputDispatcher.cpp packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_0.png packages/SystemUI/res/drawable-hdpi/stat_sys_roaming_cdma_flash_anim1.png packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_0.png packages/SystemUI/res/drawable-mdpi/stat_sys_roaming_cdma_flash_anim1.png packages/SystemUI/src/com/android/systemui/statusbar/StatusBarPolicy.java services/java/com/android/server/ConnectivityService.java services/java/com/android/server/NotificationManagerService.java services/java/com/android/server/UsbObserver.java telephony/java/com/android/internal/telephony/cdma/CDMAPhone.java Change-Id: I62ec21bc0b72a4a5e989f80d61f3e7a0d4ad3d3f
| * LayoutLib: don't render when shader's local matrix is set to 0 scale.Xavier Ducrohet2011-04-062-18/+35
| | | | | | | | Change-Id: I7726d87f3dd0475ac662f535a08c6435b8b9ed1f
| * Merge c5aeac7f from honeycomb.Xavier Ducrohet2011-04-061-23/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib: Fix issue with rendering mode. When the layout content is embedded inside a decor layout to emulate system bar (top or bottom) and title bar (or action bar) then the code computing the full required size based on the RenderingMode would fail because the decor layout would prevents the content layout to take as much room as possible. There is also an issue with the way we know render dialogs as the dialogs usually as a frame with some padding and the previous measurements would not take into account the dialog padding when increasing the screen size. This fix makes the code measure the size of the content layout in the normal rendering, and then separately from the root layout with the proper MeasureSpec to let the content grown. The difference in size is then added to the screen size. Bug: http://code.google.com/p/android/issues/detail?id=15892 Change-Id: Ie9a6c5e254b16785f817dcb9fae755d4936880aa
| * Merge 67450db0 from honeycomb. Do not merge.Xavier Ducrohet2011-03-171-11/+4
| | | | | | | | | | Change-Id: I0ca140dd6d9279ff313f930739ad40fbbed4f335 LayoutLib: TypedArray.getDimensionPixelSize can actually return <0
| * Merge 9d76581f from honeycomb. do not merge.Xavier Ducrohet2011-03-152-30/+52
| | | | | | | | | | | | | | | | LayoutLib: Fix Arc rendering. Looks like Java2D and Skia go in different directions for angles. Change-Id: I4d72db56455afe25b4f51f23a9b29d6c438119ba
| * Merge adaa12cd from honeycomb. do not merge.Xavier Ducrohet2011-03-153-12/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | LayoutLib: fix Capabilities and getDimensionPixelSize Commented out a Capability that is not in ADT 10. BridgeTypedArray.getDimensionPixelSize shouldn't call getDimension since most of the code is duplicated, and it prevents use from properly detecting malformed attribute values. Change-Id: I008334af605a89f240247a13c0024009247ec5af
| * Merge 6f2fb570 from honeycomb. do not merge.Xavier Ducrohet2011-03-142-14/+10
| | | | | | | | | | | | | | | | | | LayoutLib: Fix dimension parsing to handle negative value. Also make TypedArray.getDimensionPixelSize properly handle negative values (which are not allowed). Change-Id: I03ffcef5ab7ec7ef95419566776dcc798845fd88
| * Merge c12b4093 from honeycomb. do not merge.Xavier Ducrohet2011-03-141-25/+80
| | | | | | | | | | Change-Id: Icfbb70c097d87bf92415c6f0534346adde4c02fe LayoutLib: Implement some missing add###() method in Path.
| * Merge 1911a6f7 into gingerbread. do not merge.Xavier Ducrohet2011-02-2512-66/+67
| | | | | | | | | | Change-Id: I6d56644c4ab1a70eb4a6d0d2e5d84ea4aa674041 LayoutLib: move tests to their own project.
| * LayoutLib: Adapt the HC layoutlib to GB. do not merge.Xavier Ducrohet2011-02-2340-1422/+296
| | | | | | | | Change-Id: I0b2016987a65fabbc0ce7011514543349e9fb929
| * LayoutLib: Original import of Honeycomb's layoutlib. do not merge.Xavier Ducrohet2011-02-23141-8401/+17623
| | | | | | | | | | | | frameworks/base.git @ f0a53435f14d23d9555fc46014352ee6a7baa647 Change-Id: Ibc215751693dc7650683b61bb458f7c8beaf8060
* | Add --non-constant-id to aapt.Xavier Ducrohet2011-03-023-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option enbables creating resource constant in the R class that are not actual constant, but simply static fields. The goal is to build library projects with these types of IDs so that the constant does not get inlined in the library code, since the ID for the library resources only are not the final values. The final resource IDs, generated from the main project and its library(ies), will have proper constant with the final values. This allows us to generate binary library bundle (a jar file and associated resources) that can be distributed. Additionally, this will let us make the library project support in Eclipse much more robust and a better user experience overall. Change-Id: Ibe2f08d68493fde658fc3f7606abf7446f312ad2
* | Merge branch 'gingerbread' of ↵Steve Kondik2011-02-281-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://android.git.kernel.org/platform/frameworks/base into 233-merge Conflicts: api/current.xml core/java/android/content/pm/PackageParser.java core/java/android/net/ConnectivityManager.java core/java/android/widget/TextView.java core/java/com/android/internal/os/BatteryStatsImpl.java core/res/res/drawable-mdpi/btn_check_off.png core/res/res/drawable-mdpi/btn_check_off_disable.png core/res/res/drawable-mdpi/btn_check_off_disable_focused.png core/res/res/drawable-mdpi/btn_check_off_pressed.png core/res/res/drawable-mdpi/btn_check_off_selected.png core/res/res/drawable-mdpi/btn_check_on.png core/res/res/drawable-mdpi/btn_check_on_disable.png core/res/res/drawable-mdpi/btn_check_on_disable_focused.png core/res/res/drawable-mdpi/btn_check_on_pressed.png core/res/res/drawable-mdpi/btn_check_on_selected.png core/res/res/values-ca/strings.xml core/res/res/values-de/strings.xml core/res/res/values/config.xml include/media/AudioSystem.h include/media/mediarecorder.h media/java/android/media/MediaRecorder.java media/libmedia/AudioSystem.cpp media/libstagefright/StagefrightMediaScanner.cpp media/libstagefright/rtsp/ARTSPConnection.cpp media/libstagefright/rtsp/ASessionDescription.cpp media/libstagefright/rtsp/MyHandler.h policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java policy/src/com/android/internal/policy/impl/LockScreen.java policy/src/com/android/internal/policy/impl/PhoneWindowManager.java policy/src/com/android/internal/policy/impl/RecentApplicationsDialog.java services/audioflinger/AudioPolicyManagerBase.cpp services/java/com/android/server/PackageManagerService.java services/java/com/android/server/am/ActivityManagerService.java test-runner/src/android/test/mock/MockPackageManager.java voip/java/android/net/sip/SipProfile.java voip/java/com/android/server/sip/SipService.java wifi/java/android/net/wifi/WifiStateTracker.java Change-Id: Ia65d02a66c6206b5f4ed95c3a64e3f28a03e7329
| * GL texture filtering changed from AND to OR, so rename tag name to match.Dan Morrill2010-12-131-2/+2
| | | | | | | | | | | | | | (<uses-foo> == AND, <supports-foo> == OR, e.g. uses-feature vs. supports-screen). Change-Id: I0f20aed7f95169d9adfc7fe128191eb6e49d116f
* | Make AaptGroupEntry::getMncName accept mnc00Johan Redestig2011-02-051-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | MNC 00 is a valid network code and is used by some operators, see http://en.wikipedia.org/wiki/Mobile_Network_Code. Remove the test that checks if atoi returns zero. The string is validated to contain only numbers already. Also discussed here: https://code.google.com/p/android/issues/detail?id=3657 Change-Id: I3220d7980abe4067c9e7aa4cbc10b5fd0b8c9ea7
* | Normalize output from aapt dShachar Shemesh2011-02-051-2/+4
| | | | | | | | | | | | | | Make the output from aapt dump --values resources and aapt dump xmltree normalized, so that it is unambigously displayed regardless of the content of the strings. Change-Id: Ia3bff36c4ee1e9a44f474534e154830948beabdf
* | Merge branch 'themes-exp-2.3.1_r1' of ↵Steve Kondik2011-01-213-4/+28
|\ \ | | | | | | | | | https://github.com/tmobile/themes-platform-frameworks-base into gigglebeard
| * \ Merge commit 'android-2.3.1_r1' into themes-exp-2.3.1_r1Josh Guilfoyle2010-12-2327-98/+1309
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/java/android/app/ActivityThread.java core/java/android/content/pm/ApplicationInfo.java core/java/android/content/pm/PackageParser.java core/res/AndroidManifest.xml services/java/com/android/server/PackageManagerService.java services/java/com/android/server/SystemServer.java test-runner/src/android/test/mock/MockPackageManager.java
| * | Updated copyright headers.Josh Guilfoyle2010-11-183-0/+3
| | | | | | | | | | | | Change-Id: I4824be066a98194b4f7fa9a18682bf6701e069a6
| * | Merge commit 'themes/themes-eclair' into themes-2.2_r1Dirk Sigurdson2010-07-043-4/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: api/current.xml core/java/android/app/ActivityManager.java core/java/android/app/ActivityThread.java core/java/android/app/ApplicationContext.java core/java/android/content/Intent.java core/java/android/content/pm/PackageInfo.java core/java/android/content/res/AssetManager.java core/java/android/content/res/Configuration.java core/jni/android_util_AssetManager.cpp media/java/android/media/Ringtone.java services/java/com/android/server/PackageManagerService.java services/java/com/android/server/am/ActivityManagerService.java test-runner/android/test/mock/MockPackageManager.java
| | * | Removed legacy code used in our initial design for themes.Josh Guilfoyle2010-03-011-5/+0
| | | |
| | * | Merge remote branch 'korg/eclair' into themes-eclairDirk Sigurdson2010-02-077-22/+57
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: core/java/android/app/ActivityThread.java core/java/android/content/pm/ActivityInfo.java core/java/android/content/res/AssetManager.java
| | * \ \ Merge branch 'themes-1.5r2' into themes-eclairJosh Guilfoyle2009-11-244-4/+30
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: api/current.xml core/java/android/app/ActivityThread.java core/java/android/app/ApplicationContext.java core/java/android/app/Dialog.java core/java/android/app/SearchDialog.java core/java/android/content/Context.java core/java/android/content/Intent.java core/java/android/content/pm/PackageInfo.java core/java/android/content/pm/PackageParser.java core/java/android/content/res/Configuration.java core/java/android/content/res/Resources.java core/java/android/widget/RemoteViews.java core/java/android/widget/TabWidget.java core/java/com/android/internal/os/ZygoteInit.java core/jni/android_util_AssetManager.cpp core/res/AndroidManifest.xml core/res/res/layout/search_dropdown_item_2line.xml core/res/res/layout/select_dialog_item.xml core/res/res/layout/select_dialog_multichoice.xml core/res/res/layout/select_dialog_singlechoice.xml core/res/res/layout/tab_indicator.xml core/res/res/values/attrs.xml core/res/res/values/public.xml core/res/res/values/strings.xml core/res/res/values/themes.xml libs/utils/Android.mk libs/utils/AssetManager.cpp media/java/android/media/RingtoneManager.java services/java/com/android/server/PackageManagerService.java services/java/com/android/server/SystemServer.java services/java/com/android/server/am/ActivityManagerService.java services/java/com/android/server/status/StatusBarService.java tools/aapt/Main.cpp
| | | * | | Port over aapt -x related change.Sergey Ten2009-08-273-4/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change's SHA: 691558d8716d50a06fb2fb41548d78762f73d787. The change's check in message: Modify aapt tool (on device version ONLY) to provide proper support for -x option. CR: JoshG.
| | | * | | Remove more unnecessary code from BridgeContext.java.Josh Guilfoyle2009-08-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit amends 55eae557309fd6f3f23670ba6608eee1dd0f6789. CR: Sergey Ten
| | | * | | Revert "This is a patch I've checked in in the old repo and apparently it ↵Josh Guilfoyle2009-08-077-132/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was not ported to devpde01." This checkin introduced aapt changes to build on the device, which are no longer a required part of the flow. This reverts commit 30f0b7eac75e70e8cedce42b614f33ef5c0a5785. CR: Sergey Ten
| | | * | | Remove old setStyledTheme and getStyledTheme.Josh Guilfoyle2009-07-291-10/+0
| | | | | |
| | | * | | Fixed BridgeXmlBlockParser now that I added getAttributeDataTypeJosh Guilfoyle2009-07-291-0/+5
| | | | | |
| | | * | | Continued research into TypedArrayComposite designPankaj Kumar2009-07-291-0/+12
| | | | | |
| | | * | | This is a patch I've checked in in the old repo and apparently it was not ↵Sergey Ten2009-07-147-5/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ported to devpde01. This is a first scoop of bringing in aapt tool on a device. We just build aapt as a stand-alone executable for both HOST and TARGET platforms. In future release, we plan to re-factor existing code to produce libaapt library (static for HOST and shared for TARGET), to make sure that the functionality implemented by the library would be exposed (via JNI) to the Java layer. That way, we would be able to invoke aapt in-proc from Java code, instead of spawning a separate process. Here is a brief description of the changes: 1. Introduced HOST_LIB compile flag to differentiate HOST and TARGET flavors. 2. Moved ZipFile.cpp and ZipEntry.cpp (libutils) from hostSources to commonSources, DESPITE GOOGLE's COMMENT in Android.mk. 3. Currently, only 3 following commands are supported by aapt on device: - create a compiled resource package (package command); - add new resource to existing package (add command); - remove resource from existing package (remove command).
| * | | | | As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk filesDan Morrill2010-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission. Change-Id: Ia629e9ef0425a577e4e14f9b348f5aa2b39c1e74
* | | | | | Support changing style parent in overlaysMartin Nordholts2011-01-211-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Package overlays makes it possible for vendors to tweak the look of the platform and the applications without touching any platform or application code directly. This makes package overlays an important mechanism in the Android build system. There is currently a limitation that forbids changing the parent of a style. If vendors could change the parent of e.g. ‘CalendarTheme’ from Android’s vanilla ‘Theme’ to ‘VendorTheme’, then vendor specific adjustments could be done without changing any code directly. From looking at the code it can be seen that the parent value of a style is stored temporarily in ResourceTable::Entry::mParent while overlays are gone through in buildResources(), and processed (in ResourceTable::Entry::assignResourceIds()) at first after all overlays have been handled, so there aren’t any obvious reasons why changing parent in an overlay should be forbidden. Change-Id: I5969bb8aab90df437e1967fc504cc0da79107d13
* | | | | | aapt: Allow raw "%" in unformatted string-arraysJosh Stone2011-01-171-0/+16
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 15fe2cb added format checking for translatable strings, enforcing the use of positional args. This check can be disabled on <string> values with translatable="false" or formatted="false". But they didn't check for those attributes on <string-array>, so some of CM's strings fail when they're not really format strings, just because they contain percent signs. (e.g. brightness widget's "Auto/Dim/40%/100%") So now the formatted/translatable attributes are checked in string-array too, and we can restore our proper percent signs. Change-Id: I88df7b9ae38760be202d9d75e68f707abdbf3d95
* | | | | fix xlarge support in aapt for gingerbreadScott Main2010-11-041-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I4d8872fb839a6eadc538055215d4455af328846c
generated by cgit v1.1 at 2025-08-16 09:17:05 +0000