375 Commits

Author SHA1 Message Date
Android (Google) Code Review
89d3a92ef7 am 47538fe6: Merge change 3337 into donut
Merge commit '47538fe6131d888edf542422a767528971797f5f'

* commit '47538fe6131d888edf542422a767528971797f5f':
  Fix external bug 2875: Matrix#mValues[7] assigned twice in place of mValues[8]
2009-06-05 21:16:54 -07:00
Robert Greenwalt
1aa8170e6a Add per-named-item overlay ability in res xml.
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
2009-06-05 16:09:24 -07:00
Mathias Agopian
55e3d60da5 break dependency on utils/ZipEntry.h and utils/ZipFile.h, get rid of inet_address.h and Socket.h which were not used 2009-06-05 14:56:35 -07:00
Xavier Ducrohet
1741ec39a9 Fix external bug 2875: Matrix#mValues[7] assigned twice in place of mValues[8] 2009-06-05 12:58:29 -07:00
The Android Open Source Project
1c3b03b927 merged 2b5f84a117ee6f51ed21239719afba0f33c182ff w/minor conflicts 2009-06-04 23:08:44 -07:00
Brian Swetland
24bd82a92f localize: remove dependency on mkdirs/etc in libhost
This will let us break the libhost dependency on libutils.

Signed-off-by: Brian Swetland <swetland@google.com>
2009-06-04 14:05:36 -07:00
Mitsuru Oshima
342d59d319 am 9189cabb: * Moved supports-density tag under manifest * 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.
Merge commit '9189cabb0b6c6c28232fe6f412b7ba7a37352a6a'

* commit '9189cabb0b6c6c28232fe6f412b7ba7a37352a6a':
  * Moved supports-density tag under manifest
2009-06-03 16:34:47 -07:00
Mitsuru Oshima
9189cabb0b * Moved supports-density tag under manifest
* 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.
2009-06-03 16:28:10 -07:00
Mathias Agopian
3b4062eeb0 get rid of utils.h 2009-05-31 19:13:00 -07:00
The Android Open Source Project
bb59a9f428 Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'
Conflicts:
	api/current.xml
	core/res/res/values/public.xml
2009-05-20 22:41:10 -07:00
Dianne Hackborn
f479aa0900 Add padding to public.xml to avoid breaking from auto-merges. 2009-05-20 16:30:59 -07:00
Jean-Baptiste Queru
843ef36f7b donut snapshot 2009-05-20 11:28:04 -07:00
Android (Google) Code Review
f1f12f8cfc am 656a2726: Merge change 1910 into donut
Merge commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9'

* commit '656a2726ad977be194c3b8f4bf4ec3068bf3e1c9':
  Update aapt badging for native code, configs, density, etc.
2009-05-18 23:56:07 -07:00
Dianne Hackborn
bb9ea30ea9 Update aapt badging for native code, configs, density, etc. 2009-05-18 15:22:00 -07:00
Dianne Hackborn
072e499a0e Merge commit 'refs/changes/39/1839/1' of ssh://hackbod@android-git.corp.google.com:29418/platform/frameworks/base into merge 2009-05-15 21:15:37 -07:00
Dianne Hackborn
fa6baa259d Argh fix another build breakage! 2009-05-15 18:50:34 -07:00
Dianne Hackborn
62da8461ed Implement compatibility support for WRITE_SDCARD permission.
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.
2009-05-15 18:23:56 -07:00
Dianne Hackborn
a96cbb435d Implement compatibility support for WRITE_SDCARD permission.
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.
2009-05-15 18:02:47 -07:00
Android (Google) Code Review
7a9bde9ab1 am 6ee44d1: Merge change 1258 into donut
Merge commit '6ee44d1ff30627388bf3afa5fa542780af8f4005'

* commit '6ee44d1ff30627388bf3afa5fa542780af8f4005':
  Fix 1840639 to support overlays with zz_ZZ.
2009-05-11 11:22:25 -07:00
Robert Greenwalt
32c2c90220 Fix 1840639 to support overlays with zz_ZZ.
Everything but strings worked fine before but a new default string would generate a build error.
2009-05-08 11:45:37 -07:00
Dianne Hackborn
7a13559501 merged 231cc608d06ffc31c24bf8aa8c8275bdd2636581 2009-05-06 00:28:37 -07:00
Dianne Hackborn
231cc608d0 Rewrite SyncStorageEngine to use flat files and in-memory data structures.
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.
2009-05-05 15:40:53 -07:00
Android (Google) Code Review
f8e0169b78 am 06d9602: Merge change 1000 into donut
Merge commit '06d96020c35dac2bf1651cb8bd4cfced911f1142'

* commit '06d96020c35dac2bf1651cb8bd4cfced911f1142':
  Ignore layout bin directories in git.
2009-05-05 13:47:39 -07:00
Raphael
33fbd3bee0 Ignore layout bin directories in git. 2009-05-05 12:39:28 -07:00
Mitsuru Oshima
c2839e0870 am 13735a2: Merge branch \'readonly-p4-donut\' into donut
Merge commit '13735a255dedd2c2e3b0cff66f0be2e17671f553'

* commit '13735a255dedd2c2e3b0cff66f0be2e17671f553':
  AI 147976: Compatibility mode support. Part 2.
2009-04-29 13:35:38 -07:00
Android (Google) Code Review
0363da888d am fd9b3c0: Merge change 570 into donut
Merge commit 'fd9b3c00fda65ac2ece0ab93454fdb61dff792cc'

* commit 'fd9b3c00fda65ac2ece0ab93454fdb61dff792cc':
  Add file to ignore the content of the layoutlib/Bridge Eclipe bin folder.
2009-04-29 13:35:28 -07:00
Mitsuru Oshima
13735a255d Merge branch 'readonly-p4-donut' into donut 2009-04-28 18:13:25 -07:00
Mitsuru Oshima
8169daed2f AI 147976: Compatibility mode support. Part 2.
* 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
2009-04-28 18:12:09 -07:00
Xavier Ducrohet
d4943a9a7b Add file to ignore the content of the layoutlib/Bridge Eclipe bin folder. 2009-04-24 17:01:56 -07:00
The Android Open Source Project
284e9b2753 Merge commit 'korg/donut' 2009-04-24 13:54:57 -07:00
Marco Nelissen
d3af590f9c Merge branch 'readonly-p4-master' 2009-04-20 16:17:25 -07:00
Marco Nelissen
6a1fadea85 AI 147028: Fix up aapt so it runs cleanly under the valgrind leak checker.
Automated import of CL 147028
2009-04-20 16:16:01 -07:00
Xavier Ducrohet
59bf504f5c Merge branch 'readonly-p4-master' 2009-04-18 21:43:30 -07:00
Xavier Ducrohet
ddcc5bca5e AI 146586: am: CL 146485 am: CL 146411 Fix BridgeCanvas#drawRoundRect
Original author: xav
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146586
2009-04-18 21:42:17 -07:00
Xavier Ducrohet
e30661294b AI 146485: am: CL 146411 Fix BridgeCanvas#drawRoundRect
Original author: xav
  Merged from: //branches/cupcake/...

Automated import of CL 146485
2009-04-16 12:44:37 -07:00
Xavier Ducrohet
9d1eced4a8 AI 146411: Fix BridgeCanvas#drawRoundRect
BUG=1792311

Automated import of CL 146411
2009-04-15 22:30:00 -07:00
The Android Open Source Project
5e8c31ac31 Merge commit 'korg/cupcake' 2009-04-14 18:18:03 -07:00
Robert Greenwalt
ae5728d67a AI 144950: Manual integration of 144342 and 144547 from donutburger to cupcake.
Fix bag (string-array, etc) behavior with overlays.
  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 final result.
  Ex: [A,B,C] default with [D] overlay should give [D] but used to
  give [D,B,C]
  BUG=1754390

Automated import of CL 144950
2009-04-07 17:19:28 -07:00
Robert Greenwalt
a5ae641b0c Merge branch 'readonly-p4-master' 2009-04-03 16:46:32 -07:00
Robert Greenwalt
304b4de6ba AI 144548: am: CL 144547 Fix change 144342 by making it active only during overlay processing.
Original author: rgreenwalt

Automated import of CL 144548
2009-04-03 16:45:18 -07:00
Robert Greenwalt
9411a39866 AI 144547: Fix change 144342 by making it active only during overlay processing.
BUG=1754390

Automated import of CL 144547
2009-04-03 16:44:30 -07:00
Robert Greenwalt
75817ee3e2 Merge branch 'readonly-p4-master' 2009-04-02 23:37:35 -07:00
Robert Greenwalt
235f4328f4 AI 144413: am: CL 144342 Fix bag (string-array,etc) behavior with overlays.
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
2009-04-02 23:36:26 -07:00
Suchi Amalapurapu
8920894814 Merge branch 'readonly-p4-master' 2009-04-02 23:19:43 -07:00
Suchi Amalapurapu
c700c70ccd AI 144406: am: CL 144309 am: CL 144308 aapt extensions: required sdk 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
2009-04-02 23:18:34 -07:00
Robert Greenwalt
4b4f4a9088 AI 144342: Fix bag (string-array,etc) behavior with overlays.
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
2009-04-02 16:55:50 -07:00
Suchi Amalapurapu
7ef189d0a9 AI 144309: am: CL 144308 aapt extensions: required sdk version, dependent 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
2009-04-02 15:20:29 -07:00
Suchi Amalapurapu
633d8cddb8 AI 144308: aapt extensions: required sdk version, dependent software libraries, gadgets
Add new attributes for sdk version, software libs and gadgets
  BUG = 1730924
  BUG=1730924

Automated import of CL 144308
2009-04-02 15:19:31 -07:00
The Android Open Source Project
e1861133d5 Merge commit 'korg/cupcake'
Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/widget/TwoLineListItem.java
	preloaded-classes
2009-03-27 15:38:40 -07:00
Scott Tsai
8a2b9083e3 localize: include <cstdio> in files that uses the printf family of
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.
2009-03-21 08:08:36 +08:00