summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* am 1aa8170e: Add per-named-item overlay ability in res xml.Robert Greenwalt2009-06-052-5/+17
|\ | | | | | | | | | | | | Merge commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707' * commit '1aa8170e6a448afad86e5d62927d3b8ca4cd9707': Add per-named-item overlay ability in res xml.
| * Add per-named-item overlay ability in res xml.Robert Greenwalt2009-06-052-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes 1899451. Also errors out if you add a bag via an overlay (which would renumber resources). Note that you can still add elements within the bag as they are not issued resource IDs. So for example you can now modify the framework themes.xml file without copying the entire file. All bag types are now modifable except non-named bag types (how would you address which element to replace?): array string_array integer_array
* | am 47538fe6: Merge change 3337 into donutAndroid (Google) Code Review2009-06-051-66/+66
|\ \ | |/ | | | | | | | | | | Merge commit '47538fe6131d888edf542422a767528971797f5f' * commit '47538fe6131d888edf542422a767528971797f5f': Fix external bug 2875: Matrix#mValues[7] assigned twice in place of mValues[8]
| * Fix external bug 2875: Matrix#mValues[7] assigned twice in place of mValues[8]Xavier Ducrohet2009-06-051-66/+66
| |
* | break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of ↵Mathias Agopian2009-06-0510-6/+2614
| | | | | | | | inet_address.h and Socket.h which were not used
* | merged 2b5f84a117ee6f51ed21239719afba0f33c182ff w/minor conflictsThe Android Open Source Project2009-06-042-2/+35
|\ \ | |/
| * localize: remove dependency on mkdirs/etc in libhostBrian Swetland2009-06-042-2/+35
| | | | | | | | | | | | This will let us break the libhost dependency on libutils. Signed-off-by: Brian Swetland <swetland@google.com>
* | am 9189cabb: * Moved supports-density tag under manifest * Refactored ↵Mitsuru Oshima2009-06-031-8/+0
|\ \ | |/ | | | | | | | | | | | | | | Compatibility code * Added CompatibilityInfo class * Removed getApplicationScale from Context * Added Resources#getCompatibilityInfo so that RootView can get the compatibility info w/o going through Context * Expandable support * Added expandable tag under manifest * Old application w/o expandable is given the default screen size ([320, 480] x density). * The non-expandable window is centered. Merge commit '9189cabb0b6c6c28232fe6f412b7ba7a37352a6a' * commit '9189cabb0b6c6c28232fe6f412b7ba7a37352a6a': * Moved supports-density tag under manifest
| * * Moved supports-density tag under manifestMitsuru Oshima2009-06-031-8/+0
| | | | | | | | | | | | | | | | | | | | | | * Refactored Compatibility code * Added CompatibilityInfo class * Removed getApplicationScale from Context * Added Resources#getCompatibilityInfo so that RootView can get the compatibility info w/o going through Context * Expandable support * Added expandable tag under manifest * Old application w/o expandable is given the default screen size ([320, 480] x density). * The non-expandable window is centered.
* | get rid of utils.hMathias Agopian2009-05-315-5/+20
| |
* | Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'The Android Open Source Project2009-05-201-5/+116
|\ \ | |/ | | | | | | | | Conflicts: api/current.xml core/res/res/values/public.xml
| * Add padding to public.xml to avoid breaking from auto-merges.Dianne Hackborn2009-05-201-5/+116
| |
* | am 656a2726: Merge change 1910 into donutAndroid (Google) Code Review2009-05-181-23/+107
|\ \ | |/ | | | | | | | | | | Merge commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9' * commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9': Update aapt badging for native code, configs, density, etc.
| * Update aapt badging for native code, configs, density, etc.Dianne Hackborn2009-05-181-23/+107
| |
* | Merge commit 'refs/changes/39/1839/1' of ↵Dianne Hackborn2009-05-151-0/+2
|\ \ | |/ | | | | ssh://hackbod@android-git.corp.google.com:29418/platform/frameworks/base into merge
| * Argh fix another build breakage!Dianne Hackborn2009-05-151-0/+2
| |
| * Implement compatibility support for WRITE_SDCARD permission.Dianne Hackborn2009-05-157-6/+235
| | | | | | | | | | | | | | | | | | | | | | Now old applications will automatically be granted it. Also renamed it from SDCARD_WRITE to WRITE_SDCARD to be consistent with our other permissions, and re-arranged how we do targetSdkVersion to actually be usuable for this kind of stuff. Note that right now this results in basically all apps being given the WRITE_SDCARD permission, because their targetSdkVersion is not set. I will be dealing with that in a future change.
* | Implement compatibility support for WRITE_SDCARD permission.Dianne Hackborn2009-05-157-6/+235
| | | | | | | | | | | | | | | | | | | | | | Now old applications will automatically be granted it. Also renamed it from SDCARD_WRITE to WRITE_SDCARD to be consistent with our other permissions, and re-arranged how we do targetSdkVersion to actually be usuable for this kind of stuff. Note that right now this results in basically all apps being given the WRITE_SDCARD permission, because their targetSdkVersion is not set. I will be dealing with that in a future change.
* | am 6ee44d1: Merge change 1258 into donutAndroid (Google) Code Review2009-05-111-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '6ee44d1ff30627388bf3afa5fa542780af8f4005' * commit '6ee44d1ff30627388bf3afa5fa542780af8f4005': Fix 1840639 to support overlays with zz_ZZ.
| * Fix 1840639 to support overlays with zz_ZZ.Robert Greenwalt2009-05-081-1/+1
| | | | | | | | Everything but strings worked fine before but a new default string would generate a build error.
* | merged 231cc608d06ffc31c24bf8aa8c8275bdd2636581Dianne Hackborn2009-05-061-16/+0
|\ \ | |/
| * Rewrite SyncStorageEngine to use flat files and in-memory data structures.Dianne Hackborn2009-05-051-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation used a database for storing all of its state, which could cause a significant amount of IO activity as its tables were updated through the stages of a sync. This new implementation replaces that in-memory data structures, with hand-written code for writing them to persistent storage. There are now 4 files associated with this class, holding various pieces of its state that should be consistent. These are everything from a main XML file of account information that must always be retained, to a binary file of per-day statistics that can be thrown away at any time. Writes of these files as scheduled at various times based on their importance of the frequency at which they change. Because the database no longer exists, there needs to be a new explicit interface for interacting with the sync manager database. This is provided by new APIs on IContentService, with a hidden method on ContentResolver to retrieve the IContentService so that various system entities can use it. Other changes in other projects are required to update to the new API. The goal here is to have as little an impact on the code and functionality outside of SyncStorageEngine, though due to the necessary change in API it is still somewhat extensive.
* | am 06d9602: Merge change 1000 into donutAndroid (Google) Code Review2009-05-052-1/+3
|\ \ | |/ | | | | | | | | | | Merge commit '06d96020c35dac2bf1651cb8bd4cfced911f1142' * commit '06d96020c35dac2bf1651cb8bd4cfced911f1142': Ignore layout bin directories in git.
| * Ignore layout bin directories in git.Raphael2009-05-052-1/+3
| |
* | am 13735a2: Merge branch \'readonly-p4-donut\' into donutMitsuru Oshima2009-04-291-0/+8
|\ \ | |/ | | | | | | | | | | Merge commit '13735a255dedd2c2e3b0cff66f0be2e17671f553' * commit '13735a255dedd2c2e3b0cff66f0be2e17671f553': AI 147976: Compatibility mode support. Part 2.
| * Merge branch 'readonly-p4-donut' into donutMitsuru Oshima2009-04-281-0/+8
| |\
| | * AI 147976: Compatibility mode support. Part 2.Mitsuru Oshima2009-04-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Introduced ApplicationScale (may not be good name. CompatibilityScale? CanvasScale? Pls let me know if you have better idea) * Changes to RootView / SurfaceView - Makes the app believe it's running in the supported density/resolution. - Makes the window manager believe it's running at the right density/resolution. * Added methods to Rect/Event for scaling up/down. Known issues: * certain kind of images (such as nine patch for buttons) seesm to be loaded not by app, thus does not take the scale into account, which, in turn, is causing layout issue. * ZoomButton in MapView is rendered in wrong place * Transparent region on Surface is not correct * Specifying different densities in one process is not working. BUG=1770627 Automated import of CL 147976
* | | am fd9b3c0: Merge change 570 into donutAndroid (Google) Code Review2009-04-291-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'fd9b3c00fda65ac2ece0ab93454fdb61dff792cc' * commit 'fd9b3c00fda65ac2ece0ab93454fdb61dff792cc': Add file to ignore the content of the layoutlib/Bridge Eclipe bin folder.
| * | Add file to ignore the content of the layoutlib/Bridge Eclipe bin folder.Xavier Ducrohet2009-04-241-0/+1
| |/
| * AI 146485: am: CL 146411 Fix BridgeCanvas#drawRoundRectXavier Ducrohet2009-04-161-2/+2
| | | | | | | | | | | | | | Original author: xav Merged from: //branches/cupcake/... Automated import of CL 146485
| * AI 144547: Fix change 144342 by making it active only during overlay processing.Robert Greenwalt2009-04-031-2/+5
| | | | | | | | | | | | BUG=1754390 Automated import of CL 144547
| * AI 144342: Fix bag (string-array,etc) behavior with overlays.Robert Greenwalt2009-04-022-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | We used to replace elements in the default with elements from the overlay. This change causes us to empty the array first so if the overlay array is smaller we don't end up with elements from the default array showing through at the end of the array. Ex: [A,B,C] and overlay [D] should give [D] but used to give [D,B,C]. BUG=1754390 Automated import of CL 144342
| * AI 144309: am: CL 144308 aapt extensions: required sdk version, dependent ↵Suchi Amalapurapu2009-04-021-69/+142
| | | | | | | | | | | | | | | | | | | | | | software libraries, gadgets Add new attributes for sdk version, software libs and gadgets BUG = 1730924 Original author: asuchitra Merged from: //branches/cupcake/... Automated import of CL 144309
* | Merge branch 'readonly-p4-master'Marco Nelissen2009-04-204-13/+20
|\ \
| * | AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.Marco Nelissen2009-04-204-13/+20
| | | | | | | | | | | | Automated import of CL 147028
* | | Merge branch 'readonly-p4-master'Xavier Ducrohet2009-04-181-2/+2
|\ \ \ | |/ /
| * | AI 146586: am: CL 146485 am: CL 146411 Fix BridgeCanvas#drawRoundRectXavier Ducrohet2009-04-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Original author: xav Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 146586
* | | Merge branch 'readonly-p4-master'Robert Greenwalt2009-04-031-2/+5
|\ \ \ | |/ /
| * | AI 144548: am: CL 144547 Fix change 144342 by making it active only during ↵Robert Greenwalt2009-04-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | overlay processing. Original author: rgreenwalt Automated import of CL 144548
* | | Merge branch 'readonly-p4-master'Robert Greenwalt2009-04-022-4/+24
|\ \ \ | |/ /
| * | AI 144413: am: CL 144342 Fix bag (string-array,etc) behavior with overlays.Robert Greenwalt2009-04-022-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to replace elements in the default with elements from the overlay. This change causes us to empty the array first so if the overlay array is smaller we don't end up with elements from the default array showing through at the end of the array. Ex: [A,B,C] and overlay [D] should give [D] but used to give [D,B,C]. Original author: rgreenwalt Automated import of CL 144413
* | | Merge branch 'readonly-p4-master'Suchi Amalapurapu2009-04-021-69/+142
|\ \ \ | |/ /
| * | AI 144406: am: CL 144309 am: CL 144308 aapt extensions: required sdk ↵Suchi Amalapurapu2009-04-021-69/+142
| |/ | | | | | | | | | | | | | | | | | | | | | | version, dependent software libraries, gadgets Add new attributes for sdk version, software libs and gadgets BUG = 1730924 Original author: asuchitra Merged from: //branches/cupcake/... Original author: android-build Automated import of CL 144406
* | Merge commit 'korg/cupcake'The Android Open Source Project2009-03-271-5/+6
|\ \ | |/ | | | | | | | | | | Conflicts: core/java/android/webkit/WebView.java core/java/android/widget/TwoLineListItem.java preloaded-classes
| * auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-5/+6
| |
* | localize: include <cstdio> in files that uses the printf family ofScott Tsai2009-03-218-0/+8
| | | | | | | | | | | | | | functions to make the code build on gcc-4.4 gcc-4.4 further cleaned up header include dependencies so that e.x. including <iostream> no longer pulls in printf.
* | Include stdio.h in tools/aidl/AST.h to make the code build on gcc-4.4Scott Tsai2009-03-211-0/+1
| |
* | Merge commit 'remotes/korg/cupcake' into mergeJean-Baptiste Queru2009-03-1825-225/+784
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: core/java/android/view/animation/TranslateAnimation.java core/jni/Android.mk core/res/res/values-en-rGB/strings.xml libs/audioflinger/AudioFlinger.cpp libs/surfaceflinger/LayerScreenshot.cpp packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
| * auto import from //branches/cupcake_rel/...@138607The Android Open Source Project2009-03-133-7/+85
| |
| * auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-053-33/+47
| |
generated by cgit v1.1 at 2024-10-27 12:35:40 +0000