summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* Fix the layoutlib Paint.set(Paint) method. Do not merge.Xavier Ducrohet2010-07-191-0/+2
| | | | | | | | | It would change the text rendering info but not recompute the Java Font objects. The effect is a broken font rendering in the EditText (which use this method to copy some Paint object before using the copy for the actual drawing) Change-Id: I9e7fbf9bd57b421fd793876a6de4ade1ecac372d
* Clean up some style in the makefiles.Joe Onorato2010-07-141-3/+5
| | | | Change-Id: I993702808395f37c2e9d3c7e457d2952be51d795
* am 6b22d81a: As Donut (API=4) devices and earlier do not have a Bluetooth ↵Dan Morrill2010-06-171-1/+1
|\ | | | | | | | | | | | | | | | | API, .apk files that have minSdkLevel (or targetSdkLevel) set to 4 or lower should not be presumed to require Bluetooth just because they take the permission. Merge commit '6b22d81aa35d9a9b32670995c002e92588b2fe09' into gingerbread * commit '6b22d81aa35d9a9b32670995c002e92588b2fe09': As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk files
| * As Donut (API=4) devices and earlier do not have a Bluetooth API, .apk filesDan Morrill2010-06-151-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
* | am 9d71860e: Merge "The aapt and aidl tools are prebuilt when we\'re doing ↵Joe Onorato2010-06-152-1/+8
|\ \ | |/ | | | | | | | | | | | | | | an apps-only build, so don\'t try to build them." into froyo Merge commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a' into gingerbread * commit '9d71860e8cbaf16ddae3cd5d06ede8e6cfc7675a': The aapt and aidl tools are prebuilt when we're doing an apps-only build, so don't try to build them.
| * The aapt and aidl tools are prebuilt when we're doing an apps-only build, so ↵Joe Onorato2010-06-102-1/+8
| | | | | | | | | | | | don't try to build them. Change-Id: I9896b11a9b90cbbbe2170243c8bdbc40231dfbff
* | Native input dispatch rewrite work in progress.Jeff Brown2010-06-131-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old dispatch mechanism has been left in place and continues to be used by default for now. To enable native input dispatch, edit the ENABLE_NATIVE_DISPATCH constant in WindowManagerPolicy. Includes part of the new input event NDK API. Some details TBD. To wire up input dispatch, as the ViewRoot adds a window to the window session it receives an InputChannel object as an output argument. The InputChannel encapsulates the file descriptors for a shared memory region and two pipe end-points. The ViewRoot then provides the InputChannel to the InputQueue. Behind the scenes, InputQueue simply attaches handlers to the native PollLoop object that underlies the MessageQueue. This way MessageQueue doesn't need to know anything about input dispatch per-se, it just exposes (in native code) a PollLoop that other components can use to monitor file descriptor state changes. There can be zero or more targets for any given input event. Each input target is specified by its input channel and some parameters including flags, an X/Y coordinate offset, and the dispatch timeout. An input target can request either synchronous dispatch (for foreground apps) or asynchronous dispatch (fire-and-forget for wallpapers and "outside" targets). Currently, finding the appropriate input targets for an event requires a call back into the WindowManagerServer from native code. In the future this will be refactored to avoid most of these callbacks except as required to handle pending focus transitions. End-to-end event dispatch mostly works! To do: event injection, rate limiting, ANRs, testing, optimization, etc. Change-Id: I8c36b2b9e0a2d27392040ecda0f51b636456de25
* | am 5474902f: Merge "xhdpi" into froyoDianne Hackborn2010-06-061-0/+5
|\ \ | |/ | | | | | | | | | | Merge commit '5474902fe9fe72c825855c4a77f99a581a9f6594' into kraken * commit '5474902fe9fe72c825855c4a77f99a581a9f6594': xhdpi
| * xhdpiDianne Hackborn2010-06-041-0/+5
| | | | | | | | | | | | This is only a tool (aapt) change, and does not impact any current code. Change-Id: I562063f612af919eaadba8ac4868a95ff41ac840
* | Add error checking for translatable stringsKenny Root2010-06-033-9/+139
| | | | | | | | | | | | | | | | | | Translatable strings that have multiple substitutions should use positional String.format() substitutions. This change makes it an error not to use that format on translatable strings that have more than one substitution in its text. Change-Id: I3a19707f3804aa24e8568dc1653a11576cac5916
* | am 686d9ff5: merge from open-source masterThe Android Open Source Project2010-05-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51' into kraken * commit '686d9ff53c32ded9b2b02eb9f2040f2030846e51': Use isLocationProviderEnabled to test for enabled providers Added WEB_URL_PATTERN for Montenegro ".me" long modifier was on the wrong argument.
| * \ merge from open-source masterThe Android Open Source Project2010-05-101-1/+1
| |\ \ | | |/ | |/| | | | Change-Id: Ic2b28b589d079cf3c9927ce9ad22bc5f9134e445
| | * Merge "long modifier was on the wrong argument."Jean-Baptiste Queru2010-05-101-1/+1
| | |\
| | | * long modifier was on the wrong argument.Scott Turner2010-01-141-1/+1
| | | |
| | | * merge from eclairJean-Baptiste Queru2009-11-1552-823/+4890
| | | |\
| | | | * eclair snapshotJean-Baptiste Queru2009-11-1363-843/+4907
| | | | |
| | * | | am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" ↵Xavier Ducrohet2010-02-124-7/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eclair Merge commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a' into eclair-plus-aosp * commit '2be56ccbcff9d5f7b9b3cc0fed3825d4f037ff6a': Add --auto-add-overlay option to aapt. DO NOT MERGE
| | | * | | Add --auto-add-overlay option to aapt. DO NOT MERGEXavier Ducrohet2010-02-124-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option allows resources only present in overlays to be added automatically instead of being declared through <add-resource> (merge from master) Change-Id: I5f402a1fa7213d18724d91f84bc05ef39ace2ed9
* | | | | | am f7ebcfec: am e17b4e71: Merge "Adding the backward-compatible filtering ↵Dan Morrill2010-05-041-12/+180
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | heuristics for the new device features definitions added in FroYo." into froyo Merge commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9' into kraken * commit 'f7ebcfeccbd4433be5252857a854a6b565bf3fb9': Adding the backward-compatible filtering heuristics for the new device
| * | | | | Adding the backward-compatible filtering heuristics for the new deviceDan Morrill2010-05-041-12/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | features definitions added in FroYo. Change-Id: I5024e45c62813fe2fd2ff4d222df816a86a94f86
* | | | | | New xlarge screen size.Dianne Hackborn2010-04-281-0/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not complete, only for experimentation at this point. This includes a reworking of how screen size configurations are matched, so that if you are on a larger screen we can select configurations for smaller screens if there aren't any exactly matching the current screen. The screen size at which we switch to xlarge has been arbitrarily chosen; the compatibility behavior has not yet been defined. Change-Id: I1a33b3818eeb51a68fb72397568c39ab040a07f5
* | | | | Fix aapt to build in Windows SDK under LinuxRaphael2010-04-231-6/+6
| | | | | | | | | | | | | | | | | | | | (Merge master Change Ic4a7b9e4)
* | | | | Adds back the finalize method on the replaced Paint class.Xavier Ducrohet2010-04-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | without it com.android.layoutlib.bridge.TestClassReplacement fails. Change-Id: Iafb6548f45c31e901591a45239224895c4403be8
* | | | | Use correct API version for UTF-8 checkingKenny Root2010-03-243-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the constant for checking the API version in aapt instead of a bare number. Bug: 2541326 Change-Id: Ice7af7b393363a00f1832dd84753b8138d057fb4
* | | | | Make aapt warning conciseKenny Root2010-03-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous warning made it seem like it could be using the value specified on the command line, but, in fact, it would ignore the command line value if it were already specified in the AndroidManifest.xml Change-Id: I15e8161e094f17412680d25d3b7b810474eb4a31
* | | | | Fix minSdkVersion scanning to not throw warningsKenny Root2010-03-184-34/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the UTF8/UTF16 switch code, we needed to know what was the minSdkVersion specified as early as possible. Unfortunately, this threw warnings when the SDK was compiling since we always set this field in the Bundle. This splits out the field used by the initial AndroidManifest.xml scan to a separate one that we won't attempt to re-insert into the AndroidManifest.xml This also switches the logic to better reflect the preference of UTF-8 over UTF-16; previously UTF-16 was the default. Change-Id: Ia81f6b21047043ebb711eb24c2c3718534979ef6
* | | | | Fix issue #2519590: Lock screen stuck in landscape modeDianne Hackborn2010-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Well, mostly. There is still a problem here where the first time you show the lock screen it just doesn't draw itself. I assume this is something breaking in the view hierarchy as it floounders around removing and adding new views as it is first being shown... but no idea at this point what is the actual case. Change-Id: Iba99ae3242931c8673b17b106c86fc99e2c52abe
* | | | | Give an 9-patch error on too many rows and columnsKenny Root2010-03-121-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you have too many rows and columns, there are not enough colors in the 9-patch private metadata to represent them. Instead of crashing aapt, this change gives the user an error message telling them why it's invalid. Change-Id: I5e7bd59472a3a2eafa7cbc263792458cce2b5594
* | | | | Add correct copyright headers to multiple filesKenny Root2010-03-111-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Format for the list of changes shows the origin commit reference followed by the file name. 33931-p9 awt/org/apache/harmony/awt/gl/font/AndroidGlyphVector.java 33931-p9 awt/org/apache/harmony/awt/gl/image/PngDecoderJava.java 133776-p9 core/java/android/app/IntentService.java 127013-p9 core/java/android/appwidget/AppWidgetHost.java 27863-p9 core/java/android/bluetooth/BluetoothAudioGateway.java 60765-p9 core/java/android/content/SyncResult.java 43920-p9 core/java/android/content/pm/ActivityInfo.java 43920-p9 core/java/android/content/pm/ApplicationInfo.java 43920-p9 core/java/android/content/pm/InstrumentationInfo.java 43920-p9 core/java/android/content/pm/PackageInfo.java 44103-p9 core/java/android/content/pm/PackageItemInfo.java 68960-p9 core/java/android/content/pm/PackageStats.java 43920-p9 core/java/android/content/pm/ResolveInfo.java 43920-p9 core/java/android/content/pm/ServiceInfo.java 60641-p9 core/java/android/content/res/Configuration.java 60734-p9 core/java/android/content/res/TypedArray.java 137672-p9 core/java/android/inputmethodservice/ExtractButton.java 123112-p9 core/java/android/inputmethodservice/ExtractEditText.java 119291-p9 core/java/android/inputmethodservice/IInputMethodSessionWrapper.java 112946-p9 core/java/android/inputmethodservice/IInputMethodWrapper.java 115078-p9 core/java/android/os/BatteryStats.java 124790-p9 core/java/android/text/style/UpdateAppearance.java 45083-p9 core/java/android/view/RawInputEvent.java 101491-p9 core/java/android/view/inputmethod/EditorInfo.java 114701-p9 core/java/android/view/inputmethod/ExtractedText.java 123112-p9 core/java/android/view/inputmethod/ExtractedTextRequest.java 119291-p9 core/java/com/android/internal/os/HandlerCaller.java 129279-p9 core/java/com/android/internal/os/PkgUsageStats.java 114701-p9 core/java/com/android/internal/view/IInputConnectionWrapper.java 114701-p9 core/java/com/android/internal/view/InputConnectionWrapper.java 84364-p9 opengl/java/android/opengl/EGLLogWrapper.java 11355-p9 opengl/tools/glgen/src/CFunc.java 11355-p9 opengl/tools/glgen/src/CType.java 11355-p9 opengl/tools/glgen/src/CodeEmitter.java 11355-p9 opengl/tools/glgen/src/GenerateGL.java 11355-p9 opengl/tools/glgen/src/JFunc.java 11355-p9 opengl/tools/glgen/src/JType.java 11355-p9 opengl/tools/glgen/src/JniCodeEmitter.java 11355-p9 opengl/tools/glgen/src/ParameterChecker.java 57236-p9 services/java/com/android/server/status/AnimatedImageView.java 66754-p9 services/java/com/android/server/status/CloseDragHandle.java 57188-p9 services/java/com/android/server/status/DateView.java 46928-p9 services/java/com/android/server/status/ExpandedView.java 70590-p9 services/java/com/android/server/status/FixedSizeDrawable.java 45968-p9 services/java/com/android/server/status/IconData.java 57470-p9 services/java/com/android/server/status/IconMerger.java 82719-p9 services/java/com/android/server/status/LatestItemView.java 45968-p9 services/java/com/android/server/status/NotificationData.java 66754-p9 services/java/com/android/server/status/NotificationLinearLayout.java 57458-p9 services/java/com/android/server/status/NotificationViewList.java 45968-p9 services/java/com/android/server/status/StatusBarException.java 45968-p9 services/java/com/android/server/status/StatusBarIcon.java 46130-p9 services/java/com/android/server/status/StatusBarNotification.java 45968-p9 services/java/com/android/server/status/StatusBarView.java 46199-p9 services/java/com/android/server/status/Ticker.java 62286-p9 services/java/com/android/server/status/TickerView.java 57188-p9 services/java/com/android/server/status/TrackingView.java 86041-p9 telephony/java/android/telephony/PhoneStateListener.java 87020-p9 telephony/java/com/android/internal/telephony/TelephonyIntents.java 136269-p9 telephony/java/com/android/internal/telephony/gsm/SpnOverride.java 34409-p9 tests/FrameworkTest/src/com/android/frameworktest/FrameworkTestApplication.java 55717-p9 tests/FrameworkTest/src/com/android/frameworktest/performance/InvalidateCycle.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityLandscape.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/AutoCompleteTextViewActivityPortrait.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollablePanScan.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityNonScrollableResize.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollablePanScan.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/BigEditTextActivityScrollableResize.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/BottomEditTextActivityResize.java 127341-p9 tests/ImfTest/src/com/android/imftest/samples/ButtonActivity.java 129347-p9 tests/ImfTest/src/com/android/imftest/samples/DialogActivity.java 129372-p9 tests/ImfTest/src/com/android/imftest/samples/EditTextActivityDialog.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityNoScrollPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollPanScan.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/ManyEditTextActivityScrollResize.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivityNotSelected.java 128994-p9 tests/ImfTest/src/com/android/imftest/samples/OneEditTextActivitySelected.java 25959-p9 tests/framework-tests/src/android/test/FrameworkTests.java 46162-p9 tests/framework-tests/src/com/android/internal/http/multipart/MultipartTest.java 77101-p9 tools/layoutlib/bridge/tests/com/android/layoutlib/bridge/NinePatchTest.java 9788976b1465ce982b5ae7c741345edd0ecd9322 core/java/android/accounts/AuthenticatorDescription.java 53332883543868fb83e111a07306368b7772b340 core/java/android/app/UiModeManager.java 93e7e22ec91dbc641d10ca6d70423e1357a95bba core/java/android/app/FullBackupAgent.java 328c0e7986aa6bb7752ec6de3da9c999920bb55f core/java/android/content/CursorEntityIterator.java 307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncQueue.java 307da1a46b4c9b711bafe8fbaaa6b98e8868c18e core/java/android/content/SyncOperation.java eb034652c2037a47ebfd99779e8383bb8bb528af core/java/android/content/pm/LabeledIntent.java 49237345d83e62fdb9eb8d50b13ad086636a04fa core/java/android/content/pm/FeatureInfo.java a2b6c3775ed6b8924232d6a01bae4a19740a15f8 core/java/android/content/pm/PackageInfoLite.java 3ecd5f437580e49d80beecd29489d5fb1f7a7db0 core/java/android/content/pm/RegisteredServicesCacheListener.java 5ebbb4a6b3e16f711735ae0615b9a9ea64faad38 core/java/android/content/pm/XmlSerializerAndParser.java c4516a7b62de525e3d6d5e76851bdfaf12c11f05 core/java/android/database/sqlite/SQLiteTransactionListener.java 9bbc21a773cbdfbef2876a75c32bda5839647751 core/java/com/android/internal/backup/LocalTransport.java 21f1bd17b2dfe361acbb28453b3f3b1a110932fa core/java/com/android/internal/content/PackageMonitor.java 4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseSurfaceHolder.java 4c62fc0e1e5ea9c69a12a7d1cf8b3ec8b2d114a3 core/java/com/android/internal/view/BaseIWindow.java e540833fdff4d58e37c9ba859388e24e2945ed45 core/java/com/android/internal/os/SamplingProfilerIntegration.java 192ab903887bbb8e7c7b6da5c581573850e30f46 core/tests/coretests/src/android/widget/expandablelistview/PositionTesterContextMenuListener.java 1619367ab823150fa8856d419abe02ceb75886f1 media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/MediaProfileReader.java 27f8002e591b5c579f75b2580183b5d1c4219cd4 opengl/tools/glgen/stubs/gles11/glGetString.java 560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetProgramInfoLog.java 560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glGetShaderInfoLog.java 560814f6b11abe83ff0c4ed18cac015c276b3181 opengl/tools/glgen/stubs/gles11/glShaderSource.java 1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GenerateGLES.java 1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/Jsr239CodeEmitter.java 1c4907ee77392afb768c2f088e0dedbe4239f6fb opengl/tools/glgen/src/GLESCodeEmitter.java 69e21f5f6e0d04539cd92848ea009dd615d88c2c opengl/tests/gldual/src/com/android/gldual/TriangleRenderer.java c028be4f3b8c7476b46859f66c3f33d528adf181 packages/DefaultContainerService/src/com/android/defcontainer/DefaultContainerService.java 7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerMeasurement.java 7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestActivity.java 7c6efa13f129dbae5319f0981a430d4662f43354 tests/BrowserPowerTest/src/com/android/browserpowertest/PowerTestRunner.java df8a3f31d871db25e952972c2eb346a71186e9e3 tests/BrowserTestPlugin/src/com/android/testplugin/TestPlugin.java cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ActivityManagerPermissionTests.java cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/ServiceManagerPermissionTests.java cfaef699e1dfb3a75d5b51f3b15816f13670fd51 tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java Copyright header moved to top in following file: core/tests/coretests/src/android/widget/ListViewTest.java Change-Id: I3c3198be5a0ba36e18679ed834170432bf0b8418
* | | | | Revert "Dedupe resource config pointers"Kenny Root2010-03-102-186/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit 7b467d8b44c00d14590c021928b6a9ad5a36348e.
* | | | | Dedupe resource config pointersKenny Root2010-03-092-2/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are two configs in a StringPool that would match a string ID only keep the more generic entry to save some space. This means that if you have both "es" and "es_US" translations that have the same translation, the string entry would be removed from the "es_US" config. Change-Id: I4d619942d35ddb477e2eabe4437b7f02697c24de
* | | | | Add ability for some manifest attributes to reference resources.Dianne Hackborn2010-03-094-101/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This loosens our restriction on many manifest attributes requiring literal string values, to allow various ones to use values from resources. This is only allowed if the resource value does not change from configuration changes, and the restriction is still in place for attributes that are core to security (requesting permissions) or market operation (used libraries and features etc). Change-Id: I4da02f6a5196cb6a7dbcff9ac25403904c42c2c8
* | | | | Merge "Change an aapt "warning" from "*** " to "**** " (from three to four ↵Ed Heyl2010-03-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | stars). "*** " (three stars and a space) is the 'magic make error string'; so this change makes it easier to find the real issues/errors in build logs. Besides, other aapt messages are "**** "."
| * | | | | Change an aapt "warning" from "*** " to "**** " (from three to four stars).Ed Heyl2010-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "*** " (three stars and a space) is the 'magic make error string'; so this change makes it easier to find the real issues/errors in build logs. Besides, other aapt messages are "**** ".
* | | | | | Merge "Fix potential aapt crash when processing overlay."Xavier Ducrohet2010-03-051-11/+18
|\ \ \ \ \ \
| * | | | | | Fix potential aapt crash when processing overlay.Xavier Ducrohet2010-03-051-11/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an overlay has a type of resources that's not defined in the main res pool, then aapt would crash. This dynamically create new ResourceTypeSet when needed when processing the overlays Change-Id: I67bc3622281bde73cf42f37a0983798d3f658ce2
* | | | | | Refactor car mode.Dianne Hackborn2010-03-051-1/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract all UI behavior from dock observer and ACTION_DOCK_EVENT. Also introduce a desk type to go along with the car type all through the resource system, since we now need to have corresponding high-level broadcasts for desk dock mode. As part of that I also reworked some of the logic for switching modes to all funnel through a single update() call that looks all of the current state to decide what to do next, and fixed various locking issues. In addition I found there were bugs in the configuration change handling causing us to only switch into the car mode config and then never get out of it. Unfortunately now that we are actually changing the configuration for each mode change, the transitions between them are really crummy as we restart all kinds of activities. :(
* | | | | Fix issue #2485441: SettingsBackupAgent crashed system serverDianne Hackborn2010-03-031-44/+46
| | | | | | | | | | | | | | | | | | | | | | | | | Need to take care of fixing up backupAdjust as well as reporting it to ProGuard.
* | | | | Fix issue #2482423: Settings is broken due to dead-code strippingDianne Hackborn2010-03-021-15/+58
| | | | | | | | | | | | | | | | | | | | | | | | | Take care of more custom classes in layouts, and also scan through preference XMLs.
* | | | | Fix issue #2448075: aapt doesn't fix up activity-alias ↵Dianne Hackborn2010-03-016-10/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android:targetActivity links And related: - The aapt tool now sets a resource configurations sdk level to match any configs that have been set (for example if you specify density your sdk level will be at least 4). - New option to modify the targetPackage attribute of instrumentation. - Clean up of aapt options help. - Fix of UI type values to leave 0 for "unspecified". - Make the UI mode config APIs public.
* | | | | Re-arrange android-common so framework no longer links with it.Dianne Hackborn2010-02-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the framework part, moving classes around so the framework no longer needs to link to android-common. Makes some APIs public, others that didn't need to be public are private in the framework, some small things are copied.
* | | | | Create own reference for minSdkVersion in aaptKenny Root2010-02-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug where applications defining a minSdkVersion were experiencing transient errors from memory corruption in aapt. Change-Id: I839d5eda7388baac6133e735fa59f9799ca2822d
* | | | | Scan for android namespace in manifestKenny Root2010-02-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android:minSdkVersion wasn't being correctly scanned because the namespace was incorrect. This fixes that problem so packages aren't generated as UTF-8 when minSdkVersion is less than 7. Change-Id: I8f45d47ea886915da6a4770f6e111e6085d61bee
* | | | | Merge "Remove empty finalize methods."Carl Shapiro2010-02-243-15/+0
|\ \ \ \ \
| * | | | | Remove empty finalize methods.Carl Shapiro2010-02-243-15/+0
| | | | | |
* | | | | | Merge "New update of preloaded classes for Froyo."Jesse Wilson2010-02-244-3/+25
|\ \ \ \ \ \
| * | | | | | New update of preloaded classes for Froyo.Jesse Wilson2010-02-244-3/+25
| |/ / / / /
* | | | | | Merge "Fix the layoutlib to still support fill_parent."Xavier Ducrohet2010-02-242-2/+6
|\ \ \ \ \ \
| * | | | | | Fix the layoutlib to still support fill_parent.Xavier Ducrohet2010-02-232-2/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I5e1825f1f853cf9e31b2ee262edce636a030429d
* | | | | | Use UTF-8 strings to avoid duplicate caching, part 1Kenny Root2010-02-231-2/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | StringBlock instances containing UTF-8 strings use a cache to convert into UTF-16, but using that cache and then using a JNI call to NewString causes the UTF-8 string as well as two copies of the UTF-16 string to be held in memory. Getting the UTF-8 string directly from the StringPool eliminates one copy of the UTF-16 string being held in memory. This is part 1. Part 2 will include ResXMLParser optimizations. Change-Id: Ibd4509a485db746d59cd4b9501f544877139276c