Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,256 Commits 3 Branches 0 Tags
64b786f159e45c7a65ebcd47aed3e267d5146da6
Commit Graph

70 Commits

Author SHA1 Message Date
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
Mitsuru Oshima
4cc574be4e am 257eef3: Merge branch \'readonly-p4-donut\' into donut 
Merge commit '257eef353dfc9519b63e3fe2616505c5534b460a'

* commit '257eef353dfc9519b63e3fe2616505c5534b460a':
  AI 147845: Compatibility mode support. Part 1
 2009-04-29 13:35:29 -07:00
Android (Google) Code Review
137b0c9d64 am 0b8ffd1: Merge change 460 into donut 
Merge commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82'

* commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82':
  More optimization of dumpsys output.
 2009-04-29 13:11:27 -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
Mitsuru Oshima
257eef353d Merge branch 'readonly-p4-donut' into donut 2009-04-27 12:02:51 -07:00
Mitsuru Oshima
8d11267587 AI 147845: Compatibility mode support. Part 1 
Adding supports-density tag to manifest file/ApplicationInfo.
  BUG=1752478

Automated import of CL 147845
 2009-04-27 12:01:23 -07:00
Fred Quintana
d9d2f1140b change the sync framework and users to understand Account 2009-04-23 15:37:45 -07:00
Android (Google) Code Review
0b8ffd17bc Merge change 460 into donut 
* changes:
  More optimization of dumpsys output.
 2009-04-22 18:33:57 -07:00
Dianne Hackborn
1d442e0d99 More optimization of dumpsys output. 
There are three major classes of changes here:

- Avoid writing lines where their values are often empty, false, or some other typical thing.
- Use partial writes to the PrintWriter to avoid creating temporary strings.
- Use StringBuilder where we need to generate real String objects (and where possible cache the result).
 2009-04-22 18:03:21 -07:00
Jeff Hamilton
69c1c4983f Merge branch 'readonly-p4-master' 2009-04-21 15:17:40 -07:00
Jeff Hamilton
b0c6dbd53b AI 147255: am: CL 147253 am: CL 147250 Fix a nasty typo in the docs for ContentResolver.update(). No code changes. 
Original author: jham
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147255
 2009-04-21 15:16:13 -07:00
Jeff Hamilton
be456ac934 Merge branch 'readonly-p4-donut' into donut 2009-04-21 15:14:41 -07:00
Jeff Hamilton
348c1796d4 AI 147253: am: CL 147250 Fix a nasty typo in the docs for ContentResolver.update(). No code changes. 
Original author: jham
  Merged from: //branches/cupcake/...

Automated import of CL 147253
 2009-04-21 15:13:18 -07:00
Dianne Hackborn
81ddb7929f Merge branch 'readonly-p4-master' 2009-04-13 16:55:10 -07:00
Dianne Hackborn
b3cddae499 AI 146011: am: CL 145859 am: CL 145561 Fix issue #1710534 (documentation doesn't mention that activity resolver (and others) handle MIME types as case-sensitive). 
Original author: hackbod
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146011
 2009-04-13 16:54:00 -07:00
Dianne Hackborn
75534fbe24 Merge branch 'readonly-p4-master' 2009-04-13 16:13:37 -07:00
Dianne Hackborn
935ae463d4 AI 145994: Integrate #145778 from Donut. 
Automated import of CL 145994
 2009-04-13 16:11:55 -07:00
Dianne Hackborn
1710799c47 Merge branch 'readonly-p4-donut' into donut 2009-04-13 08:53:57 -07:00
Dianne Hackborn
06f36b401d AI 145859: am: CL 145561 Fix issue #1710534 (documentation doesn't mention that activity resolver (and others) handle MIME types as case-sensitive). 
Original author: hackbod
  Merged from: //branches/cupcake/...

Automated import of CL 145859
 2009-04-13 08:52:45 -07:00
Andy Stadler
5f05afeeb6 Merge branch 'readonly-p4-donut' into donut 2009-04-10 16:26:11 -07:00
Andy Stadler
f8a7ceaef2 AI 145778: Manual merge changes 145382-145384 from cupcake. 
Automated import of CL 145778
 2009-04-10 16:24:47 -07:00
Christopher Tate
06ba55476e Integrate new power connnect/disconnect broadcasts 
Two new broadcasts, Intent.ACTION_POWER_CONNECTED and
Intent.ACTION_POWER_CONNECTED, that are issued when the device is plugged
and unplugged from USB or AC power.  This pulls two changes from the
open-source Gerrit repo into the internal Donut codeline:

1241 fda6fae Added broadcasts for external power events.
9491 37f8ca1 Fix system service crash when booting while on battery power

The current.xml API description has also been updated to include the
new Intent fields; the new API was approved in the original OSS change.
 2009-04-09 16:03:56 -07:00
Chris Tate
93e7e3b671 Merge branch 'readonly-p4-master' 2009-04-02 23:17:06 -07:00
Chris Tate
a34df8a2ba AI 144405: am: CL 144307 am: CL 144306 Fix SDK issue 1716562 - Broadcast mechanism documentation should be improved. 
Original author: ctate
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144405
 2009-04-02 23:15:58 -07:00
Chris Tate
a919486d93 AI 144307: am: CL 144306 Fix SDK issue 1716562 - Broadcast mechanism documentation should be improved. 
Original author: ctate
  Merged from: //branches/cupcake/...

Automated import of CL 144307
 2009-04-02 15:01:22 -07:00
Bjorn Bringert
40c9703639 Merge branch 'readonly-p4-master' 2009-04-02 09:17:54 -07:00
Bjorn Bringert
3a184efa12 AI 144034: am: CL 144032 Added missing import to fix breakage caused by CL 144008. 
Original author: bringert
  Merged from: //branches/donutburger/...

Automated import of CL 144034
 2009-04-02 09:16:44 -07:00
Bjorn Bringert
ffe5e10801 Merge branch 'readonly-p4-master' 2009-04-02 09:02:11 -07:00
Bjorn Bringert
5d015d7331 AI 144010: am: CL 144008 UriMatcher: Avoid repeated calls to Uri.getPathSegments() 
in UriMatcher.match().
  Before, every call to UriMatcher.match() called
  Uri.getPathSegments() N + 1 times,
  where N is the size of the list returned by
  Uri.getPathSegments(). Since some of the implementations
  of Uri.getPathSegments() are O(N), UriMatcher.match() was O(N^2).
  This CL fixes the problem by calling uri.getPathSegments() once in
  the beginning of match(). That should be safe since Uri is
  immutable.
  Original author: bringert
  Merged from: //branches/donutburger/...

Automated import of CL 144010
 2009-04-02 09:00:58 -07:00
Bjorn Bringert
096f41d539 AI 144032: Added missing import to fix breakage caused by CL 144008. 
Automated import of CL 144032
 2009-04-01 11:13:07 -07:00
Bjorn Bringert
dc0ec18665 AI 144008: UriMatcher: Avoid repeated calls to Uri.getPathSegments() 
in UriMatcher.match().
  Before, every call to UriMatcher.match() called
  Uri.getPathSegments() N + 1 times,
  where N is the size of the list returned by
  Uri.getPathSegments(). Since some of the implementations
  of Uri.getPathSegments() are O(N), UriMatcher.match() was O(N^2).
  This CL fixes the problem by calling uri.getPathSegments() once in
  the beginning of match(). That should be safe since Uri is
  immutable.
  BUG=1751158

Automated import of CL 144008
 2009-04-01 10:27:37 -07:00
The Android Open Source Project
762d30a313 Merge branch 'open_source' into google_internal 
Conflicts:
	core/java/android/widget/TwoLineListItem.java
	core/res/res/values/public.xml
	preloaded-classes
 2009-03-29 08:55:27 -07:00
Ed Heyl
a2debb356d AI 143278: Merge 142826: Add tutorial to platform. The tutorial can be launched with the new Intent ACTION_SYSTEM_TUTORIAL and 
is available through Settings->About->System Tutorial

Automated import of CL 143278
 2009-03-27 16:52:45 -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
Jim Miller
303736d17d Automated import from //branches/donutburger/...@142826,142826 2009-03-25 18:18:34 -07:00
Jim Miller
7e4ad35590 Automated import from //branches/cupcake/...@142825,142825 2009-03-25 18:16:41 -07:00
Fred Quintana
603073430b Automated import from //branches/master/...@142414,142414 2009-03-24 22:48:12 -07:00
Fred Quintana
22f711423e Automated import from //branches/master/...@141380,141380 2009-03-24 20:10:17 -07:00
Dianne Hackborn
f63220f58e Automated import from //branches/donutburger/...@140828,140828 2009-03-24 18:38:43 -07:00
Dianne Hackborn
04750b6b43 Automated import from //branches/master/...@140830,140830 2009-03-24 18:38:23 -07:00
Bjorn Bringert
f64aff1a20 Automated import from //branches/master/...@140582,140582 2009-03-24 17:59:45 -07:00
Bjorn Bringert
9e728e082e Automated import from //branches/donutburger/...@140581,140581 2009-03-24 17:57:22 -07:00
The Android Open Source Project
c2ad241504 auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:54 -07:00
The Android Open Source Project
105925376f auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:46 -07:00
Jean-Baptiste Queru
2a73de7b21 Merge commit 'remotes/korg/cupcake' into merge 
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
 2009-03-18 11:33:14 -07:00
The Android Open Source Project
ba87e3e6c9 auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:22 -07:00
The Android Open Source Project
c39a6e0c51 auto import from //branches/cupcake/...@137873 2009-03-11 12:11:56 -07:00
The Android Open Source Project
b2a3dd88a5 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:12 -07:00
The Android Open Source Project
9066cfe988 auto import from //depot/cupcake/@135843 2009-03-03 19:31:44 -08:00