OSDN Git Service
Jean-Baptiste Queru [Tue, 7 Jul 2009 20:30:02 +0000 (13:30 -0700)]
Merge a bunch of cherry-picked changes from the open-source tree.
Kenny Root [Sat, 13 Jun 2009 10:47:27 +0000 (05:47 -0500)]
Fix hyphenation in TextView attr Javadoc
Kenny Root [Thu, 11 Jun 2009 16:00:42 +0000 (11:00 -0500)]
Fix spelling mistakes in Javadoc
Simon Schoar [Wed, 10 Jun 2009 20:08:37 +0000 (22:08 +0200)]
Removed usage of tabs for indention
Simon Schoar [Wed, 10 Jun 2009 19:53:53 +0000 (21:53 +0200)]
Prevent IndexOutOfBoundsException on toString() if vibrate array is empty (non null)
example: notification.vibrate = new long[0];
Simon Schoar [Tue, 9 Jun 2009 23:29:38 +0000 (01:29 +0200)]
Example for displaying alerts was missing an "@" for theme attribute
Simon Schoar [Tue, 9 Jun 2009 23:10:58 +0000 (01:10 +0200)]
Fixed typo, RFC3296 is for LDAP, RFC2396 is for URI
Kenny Root [Tue, 9 Jun 2009 17:07:28 +0000 (12:07 -0500)]
Fix logic inversion in ListView Javadoc
The Javadoc for isItemChecked, getCheckedItemPosition, and
getCheckedItemPositions stated the return was valid if conditions
were the inverse of what the method checked for.
This was pointed out in Android issue 2366
Kenny Root [Tue, 9 Jun 2009 18:42:54 +0000 (13:42 -0500)]
Clarify rules for package name in documentation
Nowhere in the documentation does it say that the only valid package names
are ones that match (excuse my abuse of regex to explain this):
^[A-Za-z][A-Za-z0-9_]
This change makes clear the rules followed by the PackageParser
Android (Google) Code Review [Tue, 7 Jul 2009 19:43:06 +0000 (12:43 -0700)]
Merge change 6382
* changes:
add a virtual destructor to region_rasterizer, to be on the safe side
Kenny Root [Tue, 9 Jun 2009 17:12:39 +0000 (12:12 -0500)]
Fix typo in Javadoc for LocationManager.GPS_PROVIDER
Kenny Root [Tue, 9 Jun 2009 16:21:11 +0000 (11:21 -0500)]
Fix Configuration documentation for new constants
* Added KEYBOARD_NOKEYS link to Javadoc for keyboard.
* Added NAVIGATION_NONAV link to Javadoc for navigation.
Kenny Root [Tue, 9 Jun 2009 16:08:00 +0000 (11:08 -0500)]
Fix typo in adb commandline help
Android developers are not expected to have PDP-11s.
Alan Jones [Thu, 21 May 2009 02:32:17 +0000 (12:32 +1000)]
Fixed Issue 2682: ContentProvider query() SDK docs deprecated
Yusuf T. Mobile [Fri, 15 May 2009 17:56:36 +0000 (10:56 -0700)]
Fix to Android issue 453
djken [Fri, 8 May 2009 11:07:55 +0000 (07:07 -0400)]
The comment lack of symbol # and parameter data type. This will cause compilation failed.
Cyril Mottier [Tue, 5 May 2009 16:13:48 +0000 (18:13 +0200)]
Add of Javadoc comments on undocumented methods.
Use of a constant defined in SensorManager for computing deceleration.
Brad Fitzpatrick [Mon, 27 Apr 2009 17:51:06 +0000 (10:51 -0700)]
Lazily allocate the mBounds Rect in Drawable.
For background, see:
http://kohlerm.blogspot.com/2009/04/analyzing-memory-usage-off-your-android.html
Thanks, Markus!
Android (Google) Code Review [Tue, 7 Jul 2009 19:37:27 +0000 (12:37 -0700)]
Merge change 6320
* changes:
Add method to read events from a file. Remove unused method. Fixed after review.
Mathias Agopian [Tue, 7 Jul 2009 19:29:17 +0000 (12:29 -0700)]
add a virtual destructor to region_rasterizer, to be on the safe side
Android (Google) Code Review [Tue, 7 Jul 2009 19:14:01 +0000 (12:14 -0700)]
Android (Google) Code Review [Tue, 7 Jul 2009 19:12:12 +0000 (12:12 -0700)]
Merge change 6367 into donut
* changes:
Add virtual destructor.
Android (Google) Code Review [Tue, 7 Jul 2009 18:57:40 +0000 (11:57 -0700)]
am
fdc3d110: Merge change 6379 into donut
Merge commit '
fdc3d110516a6d2f62e68d2f76c4aeace580de40'
* commit '
fdc3d110516a6d2f62e68d2f76c4aeace580de40':
Update RatingBar's assets in indicator mode.
Android (Google) Code Review [Tue, 7 Jul 2009 18:56:43 +0000 (11:56 -0700)]
Merge change 6379 into donut
* changes:
Update RatingBar's assets in indicator mode.
Romain Guy [Tue, 7 Jul 2009 18:56:15 +0000 (11:56 -0700)]
Update RatingBar's assets in indicator mode.
Android (Google) Code Review [Tue, 7 Jul 2009 18:53:23 +0000 (11:53 -0700)]
am
2c5a3aeb: Merge change 6326 into donut
Merge commit '
2c5a3aeba3f7c0d362829c57a8fffdba0a0e81c1'
* commit '
2c5a3aeba3f7c0d362829c57a8fffdba0a0e81c1':
BackupManager wrapper class improvements
Android (Google) Code Review [Tue, 7 Jul 2009 18:52:01 +0000 (11:52 -0700)]
Merge change 6326 into donut
* changes:
BackupManager wrapper class improvements
Cynthia Wong [Tue, 7 Jul 2009 18:46:05 +0000 (11:46 -0700)]
am
04f0b05e: Add a Gservices setting for how many times we should retry before discarding an uphill operation
Merge commit '
04f0b05ea04a4a13d6a15b36eaa27b2ec364f313'
* commit '
04f0b05ea04a4a13d6a15b36eaa27b2ec364f313':
Add a Gservices setting for how many times we should retry before discarding an uphill operation
Cynthia Wong [Tue, 7 Jul 2009 18:14:21 +0000 (11:14 -0700)]
Add a Gservices setting for how many times we should retry before discarding an uphill operation
Christopher Tate [Tue, 7 Jul 2009 02:04:57 +0000 (19:04 -0700)]
BackupManager wrapper class improvements
+ Now rechecks the cached IBinder each time the wrapper is used, and if it's
still null (i.e. the BackupManager was constructed before the system service
came up) it's refetched. This lets even system code cache a single
BackupManager instance and just keep making calls through it without worrying
about interactions with the life cycle of the backup service.
+ Added a static dataChanged(packageName) method as a convenience for code that
needs to indicate that some other package needs a backup pass. This is useful
even for third party code in the case of multiple packages in a shared-uid
situation.
Android (Google) Code Review [Tue, 7 Jul 2009 18:25:30 +0000 (11:25 -0700)]
am
790a604b: Merge change 6372 into donut
Merge commit '
790a604b9c32647711599710e21f0f00eb3d839c'
* commit '
790a604b9c32647711599710e21f0f00eb3d839c':
Fixes #
1963217. Increases the invalidate region in compatibility mode.
Android (Google) Code Review [Tue, 7 Jul 2009 18:25:26 +0000 (11:25 -0700)]
am
c1c44a56: Merge change 6363 into donut
Merge commit '
c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c'
* commit '
c1c44a5614c4ab7aaf5315f92dc1c8f6420c8f1c':
LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks
Android (Google) Code Review [Tue, 7 Jul 2009 18:23:44 +0000 (11:23 -0700)]
Merge change 6372 into donut
* changes:
Fixes #
1963217. Increases the invalidate region in compatibility mode.
Romain Guy [Tue, 7 Jul 2009 18:22:45 +0000 (11:22 -0700)]
Fixes #
1963217. Increases the invalidate region in compatibility mode.
To account for rounding errors when scaling the invalidate regions, increase
the dirty rectangle by 1 pixel in each direction
Marco Nelissen [Tue, 7 Jul 2009 18:03:13 +0000 (11:03 -0700)]
Add virtual destructor.
Android (Google) Code Review [Tue, 7 Jul 2009 18:02:04 +0000 (11:02 -0700)]
Merge change 6363 into donut
* changes:
LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks
Android (Google) Code Review [Tue, 7 Jul 2009 18:01:19 +0000 (11:01 -0700)]
Merge change 6361
* changes:
Fix sim build.
San Mehat [Tue, 7 Jul 2009 17:52:51 +0000 (10:52 -0700)]
am
0310f9aa: WifiService: Fix build (missing import)
Merge commit '
0310f9aa21ed8714acbe56afea061596fb8f1ac4'
* commit '
0310f9aa21ed8714acbe56afea061596fb8f1ac4':
WifiService: Fix build (missing import)
San Mehat [Tue, 7 Jul 2009 17:49:47 +0000 (10:49 -0700)]
WifiService: Fix build (missing import)
Signed-off-by: San Mehat <san@google.com>
Android (Google) Code Review [Tue, 7 Jul 2009 17:37:17 +0000 (10:37 -0700)]
am
b61479ae: Merge change 6314 into donut
Merge commit '
b61479ae868c9f2b887b2992b133a96d9ea1a193'
* commit '
b61479ae868c9f2b887b2992b133a96d9ea1a193':
Use the current Locale as the default language when TTS settings are not
Android (Google) Code Review [Tue, 7 Jul 2009 17:35:40 +0000 (10:35 -0700)]
Merge change 6314 into donut
* changes:
Use the current Locale as the default language when TTS settings are not found, rather than a hardcoded value stored in TextToSpeech.Engine.
San Mehat [Tue, 7 Jul 2009 17:19:56 +0000 (10:19 -0700)]
am
fa6c7111: WifiService: use wifi association state to determine if we should suspend wifi instead of the existance of an IP address.
Merge commit '
fa6c7111fe58e09a92741c7655221c3629d3220e'
* commit '
fa6c7111fe58e09a92741c7655221c3629d3220e':
WifiService: use wifi association state to determine if we should suspend wifi instead of
Mike Lockwood [Tue, 7 Jul 2009 17:18:21 +0000 (13:18 -0400)]
LocationManagerService: Use Context.checkCallingOrSelfPermission for permission checks
so other services running in the system process can use the location manager.
Signed-off-by: Mike Lockwood <lockwood@android.com>
Andy McFadden [Tue, 7 Jul 2009 17:01:12 +0000 (10:01 -0700)]
Fix sim build.
Looks like older gcc (4.1.x) doesn't properly handle templated
fanciness. Apparently that's what we have on the build server.
San Mehat [Tue, 7 Jul 2009 16:34:44 +0000 (09:34 -0700)]
WifiService: use wifi association state to determine if we should suspend wifi instead of
the existance of an IP address.
Signed-off-by: San Mehat <san@google.com>
Eric Laurent [Tue, 7 Jul 2009 16:36:14 +0000 (09:36 -0700)]
am
88e209dc: Fix issue
1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Merge commit '
88e209dcf8c2ebddda5c272f46d1bd5478bc639c'
* commit '
88e209dcf8c2ebddda5c272f46d1bd5478bc639c':
Fix issue
1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Eric Laurent [Tue, 7 Jul 2009 14:10:45 +0000 (07:10 -0700)]
Fix issue
1743700: AudioTrack: setPlaybackRate can not set the playback rate to twice of the ouputSR
Store sample rate on 32 bits instead of 16 bits in audio_track_cblk_t.
Removed sampleRate() methods from AudioTrack and AudioRecord: replaced by getSampleRate().
AudioTrack::setSampleRate() no returns a status.
Leon Scroggins [Mon, 6 Jul 2009 18:32:49 +0000 (14:32 -0400)]
Update text webcore thread's text generation number.
When the user edits text in a textfield, we increase a generation
number so we can mark changes from webkit to be out of date. With
this change, update webcore's notion of the text generation number
in deleteSelection and replaceTextfieldText, in addition to
passToJs. Requires a change in external/webkit.
Android (Google) Code Review [Tue, 7 Jul 2009 06:49:45 +0000 (23:49 -0700)]
am
37ea7112: Merge change 6338 into donut
Merge commit '
37ea71122579e9e2ad1f91b3eca5e4d436b54ea9'
* commit '
37ea71122579e9e2ad1f91b3eca5e4d436b54ea9':
septet-align UD after any UDH for GSM-7bit coding
Android (Google) Code Review [Tue, 7 Jul 2009 06:48:25 +0000 (23:48 -0700)]
Merge change 6338 into donut
* changes:
septet-align UD after any UDH for GSM-7bit coding
Tammo Spalink [Tue, 7 Jul 2009 06:17:28 +0000 (14:17 +0800)]
septet-align UD after any UDH for GSM-7bit coding
Mitsuru Oshima [Tue, 7 Jul 2009 04:24:08 +0000 (21:24 -0700)]
am
569076c9: widgets scaling fix. Use container\'s compatibility info and display metrics when container and widgets disagree.
Merge commit '
569076c9f6bdadb4d3285a26e069634a839b5b87'
* commit '
569076c9f6bdadb4d3285a26e069634a839b5b87':
widgets scaling fix. Use container's compatibility info and display metrics when container and widgets disagree.
Mitsuru Oshima [Fri, 3 Jul 2009 03:06:08 +0000 (20:06 -0700)]
widgets scaling fix. Use container's compatibility info and display metrics when container and widgets disagree.
Mathias Agopian [Tue, 7 Jul 2009 02:04:03 +0000 (19:04 -0700)]
trying to fix the sim, I'm not even sure this syntaxe is valid, but my compilo doesn't complain
Jim Miller [Thu, 2 Jul 2009 01:03:41 +0000 (18:03 -0700)]
Add method to read events from a file. Remove unused method. Fixed after review.
Android (Google) Code Review [Tue, 7 Jul 2009 01:26:42 +0000 (18:26 -0700)]
am
dbee95ca: Merge change 6317 into donut
Merge commit '
dbee95cacff9d2faf30638e64abe26fbeb128787'
* commit '
dbee95cacff9d2faf30638e64abe26fbeb128787':
Make enable/provisioning of the backup service a two-step process
Android (Google) Code Review [Tue, 7 Jul 2009 01:24:26 +0000 (18:24 -0700)]
Merge change 6317 into donut
* changes:
Make enable/provisioning of the backup service a two-step process
Android (Google) Code Review [Tue, 7 Jul 2009 01:08:02 +0000 (18:08 -0700)]
Merge change 6315
* changes:
should fix sim build
Mathias Agopian [Tue, 7 Jul 2009 01:07:26 +0000 (18:07 -0700)]
should fix sim build
Jean-Michel Trivi [Tue, 7 Jul 2009 00:58:52 +0000 (17:58 -0700)]
Use the current Locale as the default language when TTS settings are not
found, rather than a hardcoded value stored in TextToSpeech.Engine.
-b master [Tue, 7 Jul 2009 00:44:41 +0000 (17:44 -0700)]
resolved conflicts for merge of
b7195159 to master
Christopher Tate [Mon, 6 Jul 2009 23:36:05 +0000 (16:36 -0700)]
Make enable/provisioning of the backup service a two-step process
This CL adds the concept of 'provisioned' to the backup manager. No backups
will be scheduled until the user has indicated that backups are to be enabled
*and* has clicked all the way through the setup wizard.
When the user first turns on the backup system, the delay before the initial
backup pass is different from the periodic backup interval. Currently that
initial delay is 12 hours. The intent here is to guess at a less-active time
for performing that first backup pass.
NOTE: currently the backup service defaults to 'provisioned'. Once the real
code goes live in Setup Wizard, this will be changed to default to
not-provisioned until the user has confirmed all the relevant UI.
Android (Google) Code Review [Tue, 7 Jul 2009 00:32:09 +0000 (17:32 -0700)]
Merge change 6287 into donut
* changes:
Restore GPS state and ringer/vibrate toggles.
Amith Yamasani [Mon, 6 Jul 2009 21:53:25 +0000 (14:53 -0700)]
Restore GPS state and ringer/vibrate toggles.
Inform backup manager when sync flags change. Set ringer/vibrate mode.
Romain Guy [Tue, 7 Jul 2009 00:10:41 +0000 (17:10 -0700)]
am
870e09fc: Fixes #
1963229. Introduces Context#isRestricted().
Merge commit '
870e09fcd2dfdc12ac318962efd28b0420c562bb'
* commit '
870e09fcd2dfdc12ac318962efd28b0420c562bb':
Fixes #
1963229. Introduces Context#isRestricted().
Romain Guy [Mon, 6 Jul 2009 23:35:25 +0000 (16:35 -0700)]
Fixes #
1963229. Introduces Context#isRestricted().
A restricted Context is a special type of Context that prevents specific features
from being used. For instance, android:onClick, used by View, can be dangerous when
used from within apps widgets. By using a restricted Context to inflate apps widgets,
widgets providers are prevented from using android:onClick.
Android (Google) Code Review [Mon, 6 Jul 2009 23:29:05 +0000 (16:29 -0700)]
am
453dd50e: Merge change 6307 into donut
Merge commit '
453dd50e707aa3a4d24240935f3ff7ea0a08dc7a'
* commit '
453dd50e707aa3a4d24240935f3ff7ea0a08dc7a':
Fixes a compatibility issue with users that have the old TTS
Android (Google) Code Review [Mon, 6 Jul 2009 23:28:03 +0000 (16:28 -0700)]
Merge change 6307 into donut
* changes:
Fixes a compatibility issue with users that have the old TTS installed already.
Charles Chen [Mon, 6 Jul 2009 23:10:32 +0000 (16:10 -0700)]
Fixes a compatibility issue with users that have the old TTS
installed already.
Android (Google) Code Review [Mon, 6 Jul 2009 23:00:27 +0000 (16:00 -0700)]
am
8d07c068: Merge change 6305 into donut
Merge commit '
8d07c0684619b6c30f525d25d92835254a7220a9'
* commit '
8d07c0684619b6c30f525d25d92835254a7220a9':
Fix up permissions for 'dumpsys backup'
Android (Google) Code Review [Mon, 6 Jul 2009 22:54:49 +0000 (15:54 -0700)]
Merge change 6256
* changes:
Refactoring of VideoView.java class
Android (Google) Code Review [Mon, 6 Jul 2009 22:49:26 +0000 (15:49 -0700)]
Merge change 6305 into donut
* changes:
Fix up permissions for 'dumpsys backup'
Christopher Tate [Mon, 6 Jul 2009 22:44:54 +0000 (15:44 -0700)]
Fix up permissions for 'dumpsys backup'
James Dong [Mon, 6 Jul 2009 19:37:45 +0000 (12:37 -0700)]
Refactoring of VideoView.java class
Mathias Agopian [Mon, 6 Jul 2009 21:52:04 +0000 (14:52 -0700)]
Merge commit 'goog/master_gl' into merge_master_gl
Android (Google) Code Review [Mon, 6 Jul 2009 21:48:43 +0000 (14:48 -0700)]
Merge change 6285
* changes:
Make backup agent run in the system process as well.
Amith Yamasani [Thu, 2 Jul 2009 21:25:21 +0000 (14:25 -0700)]
Make backup agent run in the system process as well.
Android (Google) Code Review [Mon, 6 Jul 2009 21:45:20 +0000 (14:45 -0700)]
am
da93c26a: Merge change 6271 into donut
Merge commit '
da93c26a3d2ee0b7d51561b786bde63b7b238c50'
* commit '
da93c26a3d2ee0b7d51561b786bde63b7b238c50':
Propagating the error codes through the TtsService
Android (Google) Code Review [Mon, 6 Jul 2009 21:45:16 +0000 (14:45 -0700)]
am
21509240: Merge change 6283 into donut
Merge commit '
21509240b0ba00675ffc69038f20726bf8666c57'
* commit '
21509240b0ba00675ffc69038f20726bf8666c57':
Fix a bug where clicking the "more results" suggestion with the trackball
Android (Google) Code Review [Mon, 6 Jul 2009 21:38:39 +0000 (14:38 -0700)]
Merge change 6271 into donut
* changes:
Propagating the error codes through the TtsService
Android (Google) Code Review [Mon, 6 Jul 2009 21:37:54 +0000 (14:37 -0700)]
Merge change 6283 into donut
* changes:
Fix a bug where clicking the "more results" suggestion with the trackball did not seem to expand to show the corpus selectors. (http://b/
1906643)
Android (Google) Code Review [Mon, 6 Jul 2009 21:33:58 +0000 (14:33 -0700)]
am
d2882fa1: Merge change 6282 into donut
Merge commit '
d2882fa1790a976d939f29a5e39e5e7d1bc677f2'
* commit '
d2882fa1790a976d939f29a5e39e5e7d1bc677f2':
Fixes #
1963214. ProgressDialog was using the wrong indeterminate progress asset.
Android (Google) Code Review [Mon, 6 Jul 2009 21:32:18 +0000 (14:32 -0700)]
Merge change 6282 into donut
* changes:
Fixes #
1963214. ProgressDialog was using the wrong indeterminate progress asset.
Romain Guy [Mon, 6 Jul 2009 21:31:39 +0000 (14:31 -0700)]
Fixes #
1963214. ProgressDialog was using the wrong indeterminate progress asset.
Mike LeBeau [Mon, 6 Jul 2009 21:29:25 +0000 (14:29 -0700)]
Fix a bug where clicking the "more results" suggestion with the trackball
did not seem to expand to show the corpus selectors. (http://b/
1906643)
It turns out that when the trackball was used to select this item, onItemClick
was getting called on the listener twice in AutoCompleteTextView#onKeyUp:
once when we call onKeyUp on the DropDownListView, and once a little further
down when we call performCompletion(). In our case, performCompletion() is
useless since it was intended for normal AutoCompleteTextViews which populate
text into the TextView when an item in the list is clicked, but we do not
rely on this. So the easiest fix is just to make performCompletion() do nothing
in our SearchAutoComplete subclass.
Amith Yamasani [Thu, 2 Jul 2009 19:05:32 +0000 (12:05 -0700)]
Backup Wifi supplicant data.
WifiService requests a backup when it writes wifi configuration to disk.
Backup the wifi supplicant file when settings provider runs backup.
Mathias Agopian [Mon, 6 Jul 2009 21:16:55 +0000 (14:16 -0700)]
Merge commit 'goog/master' into merge_master
Charles Chen [Mon, 6 Jul 2009 21:12:36 +0000 (14:12 -0700)]
Propagating the error codes through the TtsService
Android (Google) Code Review [Mon, 6 Jul 2009 21:14:21 +0000 (14:14 -0700)]
Merge change 6269
* changes:
Revert "hand rolled out
220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again"
Android (Google) Code Review [Mon, 6 Jul 2009 21:10:36 +0000 (14:10 -0700)]
am
991eec03: Merge change 6252 into donut
Merge commit '
991eec03a73f8803d0f8c80b418480ea25293cfb'
* commit '
991eec03a73f8803d0f8c80b418480ea25293cfb':
Don't re-parse the framework resources all the time.
Android (Google) Code Review [Mon, 6 Jul 2009 21:09:16 +0000 (14:09 -0700)]
Merge change 6252 into donut
* changes:
Don't re-parse the framework resources all the time.
-b master [Mon, 6 Jul 2009 20:53:11 +0000 (13:53 -0700)]
Revert "hand rolled out
220f4d633be1098e7887dbd06f179138bf19f1ad due to interface changes on master, the change will need to be made again"
This reverts commit
f8e3ba5bfad14f3037d72eb6243258c13169cbd8.
Android (Google) Code Review [Mon, 6 Jul 2009 20:12:36 +0000 (13:12 -0700)]
am
79ec07b3: Merge change 6241 into donut
Merge commit '
79ec07b333f8982ee83de8eeb0b1927a6cb112ed'
* commit '
79ec07b333f8982ee83de8eeb0b1927a6cb112ed':
Fixes #
1444844. Set a maximum fling velocity in scrollable views.
Android (Google) Code Review [Mon, 6 Jul 2009 20:10:50 +0000 (13:10 -0700)]
Merge change 6241 into donut
* changes:
Fixes #
1444844. Set a maximum fling velocity in scrollable views.
Android (Google) Code Review [Mon, 6 Jul 2009 19:58:00 +0000 (12:58 -0700)]
am
56fbd8d8: Merge change 6258 into donut
Merge commit '
56fbd8d86a1ea60ae42185349cf8809df24d262a'
* commit '
56fbd8d86a1ea60ae42185349cf8809df24d262a':
Fix the comment -- "charged" not "sharted." Also, the other
Android (Google) Code Review [Mon, 6 Jul 2009 19:56:32 +0000 (12:56 -0700)]
Merge change 6258 into donut
* changes:
Fix the comment -- "charged" not "sharted." Also, the other strings on that screen seem to have periods. I think that's wrong, but it's better to be consistent that right.
Joe Onorato [Mon, 6 Jul 2009 19:49:04 +0000 (15:49 -0400)]
Fix the comment -- "charged" not "sharted." Also, the other
strings on that screen seem to have periods. I think that's
wrong, but it's better to be consistent that right.
Android (Google) Code Review [Mon, 6 Jul 2009 19:43:36 +0000 (12:43 -0700)]
am
57f2cba2: Merge change 6255 into donut
Merge commit '
57f2cba2db4b5565b0f70bd5501e8d964dce3ad4'
* commit '
57f2cba2db4b5565b0f70bd5501e8d964dce3ad4':
Fix the comments for the string resources for the charge status.
Android (Google) Code Review [Mon, 6 Jul 2009 19:43:32 +0000 (12:43 -0700)]
am
6eb987ac: Merge change 6246 into donut
Merge commit '
6eb987aca79db80f8ac4c28ed1cdc5841df8cfd2'
* commit '
6eb987aca79db80f8ac4c28ed1cdc5841df8cfd2':
Fix bugs
1317754 - "Idle screen displays "Charging (100%)" even when fully charged."
Android (Google) Code Review [Mon, 6 Jul 2009 19:43:28 +0000 (12:43 -0700)]
am
0d725f7d: Merge change 6162 into donut
Merge commit '
0d725f7d5a7efd9dc63f6ddb67a619d659bb4428'
* commit '
0d725f7d5a7efd9dc63f6ddb67a619d659bb4428':
Hold a wakelock during backup/restore/clear operations