OSDN Git Service
Dianne Hackborn [Wed, 1 Sep 2010 02:03:31 +0000 (19:03 -0700)]
am
5774d5d3: Show correct process dependency for providers.
Merge commit '
5774d5d34b2339135feab01b998fcd111ebdde4d' into gingerbread-plus-aosp
* commit '
5774d5d34b2339135feab01b998fcd111ebdde4d':
Show correct process dependency for providers.
Dianne Hackborn [Tue, 31 Aug 2010 00:43:05 +0000 (17:43 -0700)]
Show correct process dependency for providers.
Use the new API that allows us to always retrieve the desired
provider info.
Change-Id: I9265d8f169ee34c87f0ca89315ee78bb2ae49674
Brad Fitzpatrick [Mon, 30 Aug 2010 19:33:48 +0000 (12:33 -0700)]
am
22aa2130: Merge "Make power control widget be more responsive. Fix StrictMode violations." into gingerbread
Merge commit '
22aa2130fe40952d477a998ba60dea99ada32711' into gingerbread-plus-aosp
* commit '
22aa2130fe40952d477a998ba60dea99ada32711':
Make power control widget be more responsive. Fix StrictMode violations.
Eric Fischer [Mon, 30 Aug 2010 19:33:01 +0000 (12:33 -0700)]
am
92669a51: Import revised translations. DO NOT MERGE
Merge commit '
92669a512a80fb99b71cbdf22aca9d91ae006b01' into gingerbread-plus-aosp
* commit '
92669a512a80fb99b71cbdf22aca9d91ae006b01':
Import revised translations. DO NOT MERGE
Brad Fitzpatrick [Mon, 30 Aug 2010 18:35:23 +0000 (11:35 -0700)]
Merge "Make power control widget be more responsive. Fix StrictMode violations." into gingerbread
Eric Fischer [Sat, 28 Aug 2010 00:17:47 +0000 (17:17 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I258c6a8b900eae6e101ad910b9414e5ba857246d
Brad Fitzpatrick [Fri, 27 Aug 2010 23:59:41 +0000 (16:59 -0700)]
Make power control widget be more responsive. Fix StrictMode violations.
Also use new location providers changed broadcast intent, and fix a bug
introduced in Froyo where we stopped observing the SYSTEM_CLOSE_DIALOGS
intent so we fell out of sync (more often) with the sync settings.
Now even responsive during the boot I/O storm! (except for toggling
brightness, which still does disk writes from the UI thread...)
BUG=
2956025
Change-Id: I77876ff6e0be2325c15d5f08bb2970edf233f839
Jean-Michel Trivi [Thu, 26 Aug 2010 00:31:26 +0000 (17:31 -0700)]
am
a457719c: Add new string for the notification to be displayed when the user installs a new TTS engine.
Merge commit '
a457719c5042f944540f76c03b5e61ecd0ffae39' into gingerbread-plus-aosp
* commit '
a457719c5042f944540f76c03b5e61ecd0ffae39':
Add new string for the notification to be displayed when the user
Jean-Michel Trivi [Wed, 25 Aug 2010 22:43:17 +0000 (15:43 -0700)]
Add new string for the notification to be displayed when the user
installs a new TTS engine.
Change-Id: If370cc40b0da858ec838711190d6b660b1c34ebf
Jean-Baptiste Queru [Tue, 24 Aug 2010 06:36:55 +0000 (23:36 -0700)]
am
02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '
02e731fb6452df796d976cb9e407b210cfffcda5' into gingerbread-plus-aosp
* commit '
02e731fb6452df796d976cb9e407b210cfffcda5':
Import revised translations
Jean-Baptiste Queru [Tue, 24 Aug 2010 02:09:14 +0000 (19:09 -0700)]
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Change-Id: I1d1d611f22f6d0bc9dbdd29a4b1eff497e1afd74
Dianne Hackborn [Fri, 20 Aug 2010 22:15:49 +0000 (15:15 -0700)]
am
e55b0e2e: Fix issue #
2895310: Please fix problems with your strings
Merge commit '
e55b0e2e88adc2be5958d0ae4ea310997aa2002f' into gingerbread-plus-aosp
* commit '
e55b0e2e88adc2be5958d0ae4ea310997aa2002f':
Fix issue #
2895310: Please fix problems with your strings
Dianne Hackborn [Fri, 20 Aug 2010 22:10:26 +0000 (15:10 -0700)]
Fix issue #
2895310: Please fix problems with your strings
Make up some numbers.
Change-Id: Ib3d1018282efd4979be8ef22384c9d64e67456e4
Dianne Hackborn [Fri, 20 Aug 2010 01:37:35 +0000 (18:37 -0700)]
am
4749fcf7: More tricksy.
Merge commit '
4749fcf762de0e34ac28f927501d42555062c521' into gingerbread-plus-aosp
* commit '
4749fcf762de0e34ac28f927501d42555062c521':
More tricksy.
Dianne Hackborn [Fri, 20 Aug 2010 01:11:51 +0000 (18:11 -0700)]
More tricksy.
Change-Id: I4752344e0eea302ba28e907ff5bd5c20f74a82b7
Jake Hamby [Thu, 19 Aug 2010 02:36:53 +0000 (19:36 -0700)]
am
2fcfb289: Merge " Fix Bluetooth Settings activity memory leak."
Merge commit '
2fcfb28982b84a6383774cfd50d6a963b1a985e1' into gingerbread-plus-aosp
* commit '
2fcfb28982b84a6383774cfd50d6a963b1a985e1':
Fix Bluetooth Settings activity memory leak.
Jake Hamby [Thu, 19 Aug 2010 02:29:53 +0000 (19:29 -0700)]
Merge " Fix Bluetooth Settings activity memory leak."
Dianne Hackborn [Thu, 19 Aug 2010 01:42:18 +0000 (18:42 -0700)]
am
a712c3b7: A couple small settings fixes:
Merge commit '
a712c3b7b5a17129d016ede082e3e3b2bbd31f9a' into gingerbread-plus-aosp
* commit '
a712c3b7b5a17129d016ede082e3e3b2bbd31f9a':
A couple small settings fixes:
Dianne Hackborn [Thu, 19 Aug 2010 00:47:39 +0000 (17:47 -0700)]
A couple small settings fixes:
- Correctly position WIFI/GPS charts.
- Start out with running services hidden in case we need to show
the progress bar.
Change-Id: I8852f334f68f4e9122b5d688d9fd57d0f94d94d8
Eric Fischer [Wed, 18 Aug 2010 20:36:36 +0000 (13:36 -0700)]
am
f8a91b53: Import revised translations. DO NOT MERGE
Merge commit '
f8a91b535b05619061dad5870db2318b012bbc0b' into gingerbread-plus-aosp
* commit '
f8a91b535b05619061dad5870db2318b012bbc0b':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 17 Aug 2010 23:45:27 +0000 (16:45 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: If954fbc7c9ff4898e76e6e4dcde4f9dffdd7cbf2
thigobr [Wed, 21 Jul 2010 16:10:04 +0000 (13:10 -0300)]
Fix Bluetooth Settings activity memory leak.
There were two leaks in Bluetooth Settings: one when rotating the
phone and other when scanning for bluetooth devices.
Ben Clark [Tue, 17 Aug 2010 14:48:32 +0000 (07:48 -0700)]
am
0008d219: Refactor to remove multiple in-loop Object[]->String[] castings
Merge commit '
0008d219a2964218477d5bd5f28a848844063c44' into gingerbread-plus-aosp
* commit '
0008d219a2964218477d5bd5f28a848844063c44':
Refactor to remove multiple in-loop Object[]->String[] castings
Dianne Hackborn [Mon, 16 Aug 2010 00:37:14 +0000 (17:37 -0700)]
am
ff3673c7: Make running services initial update async.
Merge commit '
ff3673c7f477b1d78e64a8bc28754552dcdc8826' into gingerbread-plus-aosp
* commit '
ff3673c7f477b1d78e64a8bc28754552dcdc8826':
Make running services initial update async.
Dianne Hackborn [Mon, 16 Aug 2010 00:28:36 +0000 (17:28 -0700)]
Make running services initial update async.
Also fix the value show for an app's awake time.
Change-Id: I801681d3a1d47a6bb1f3fb8cc5b0ef009201146f
Dianne Hackborn [Fri, 13 Aug 2010 23:00:49 +0000 (16:00 -0700)]
am
be5994d2: Some improvements to the battery usage UI:
Merge commit '
be5994d20152c7194aac79eb8152240655fd3373' into gingerbread-plus-aosp
* commit '
be5994d20152c7194aac79eb8152240655fd3373':
Some improvements to the battery usage UI:
Dianne Hackborn [Fri, 13 Aug 2010 21:15:44 +0000 (14:15 -0700)]
Some improvements to the battery usage UI:
- Show wake lock usage in the battery history.
- Show WIFI usage in the battery history.
- Show the amount an app has held a wake lock in the app details.
- Also fix service run time computation in running services.
Change-Id: I5aa959857f83808fbc709f65204f59bbfb73935b
Jean-Baptiste Queru [Thu, 12 Aug 2010 21:30:26 +0000 (14:30 -0700)]
Fix build - add missing import
Change-Id: I31c5db903532c68b42760f29b3fbb46c7c7854f8
Dianne Hackborn [Thu, 12 Aug 2010 05:32:15 +0000 (22:32 -0700)]
am
36735462: More version info.
Merge commit '
3673546205ebf1b4c83c212c1032eea38c8adbe7' into gingerbread-plus-aosp
* commit '
3673546205ebf1b4c83c212c1032eea38c8adbe7':
More version info.
Dianne Hackborn [Thu, 12 Aug 2010 05:28:29 +0000 (22:28 -0700)]
More version info.
Change-Id: I006951028135e95ce7bb2463f00649a691b5f615
Eric Fischer [Tue, 10 Aug 2010 19:00:38 +0000 (12:00 -0700)]
am
38f15782: Import revised translations. DO NOT MERGE
Merge commit '
38f157820750b90434208ef66330dcab52882ede' into gingerbread-plus-aosp
* commit '
38f157820750b90434208ef66330dcab52882ede':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 10 Aug 2010 18:52:27 +0000 (11:52 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Iecf4053f74ab4c38b165291feef5211ce4cfc83e
Eric Fischer [Wed, 4 Aug 2010 17:59:25 +0000 (10:59 -0700)]
am
4d9d75a4: Import revised translations. DO NOT MERGE
Merge commit '
4d9d75a42471ca65670fd2adc80d37bca43a69f6' into gingerbread-plus-aosp
* commit '
4d9d75a42471ca65670fd2adc80d37bca43a69f6':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 4 Aug 2010 17:45:20 +0000 (10:45 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic83849d97650cec0560d847a962756c53d65ea78
Dianne Hackborn [Fri, 30 Jul 2010 22:25:29 +0000 (15:25 -0700)]
am
0f9daab7: Manage apps "third party" and "on sd card" filters were swapped.
Merge commit '
0f9daab75f1557722b6e687a68eebfd5d28cbc51' into gingerbread-plus-aosp
* commit '
0f9daab75f1557722b6e687a68eebfd5d28cbc51':
Manage apps "third party" and "on sd card" filters were swapped.
Dianne Hackborn [Fri, 30 Jul 2010 21:26:37 +0000 (14:26 -0700)]
Manage apps "third party" and "on sd card" filters were swapped.
Also change the app details screen to make use of the common
ApplicationsState object for its UI, improving launch performance.
Change-Id: I387ed72a06d44aab47a85692c10247ce488c605c
Ben Clark [Tue, 27 Jul 2010 15:20:59 +0000 (16:20 +0100)]
Refactor to remove multiple in-loop Object[]->String[] castings
(This replaces Iaa0f3b25eaadb094a4c3fb4cecbd09e0322aae33)
This change removes the need to convert Object[]->String[] for each iteration
of each of available,tethered,errored states in updateStatus()
by converting these as soon as possible.
This fix (and the code before) is strange because each of available,tethered,
errored are defined as type ArrayList<String> but
intent.getStringArrayListExtra() returns type Object[] dispite its name.
Because other calls to updateState() use String[] it seems best to do the
conversion outside this method in the Object[] case and thus avoid the
per-iteration casting in the Object[] case and the downright wasteful
per-iteration String[]->Object[]->String[] casting in the String[] input cases.
I've also removed some unused imports and an unused variable.
Change-Id: I805ef19aa9ceff7e4fc491623cdcb413ce170798
Dianne Hackborn [Thu, 29 Jul 2010 00:44:19 +0000 (17:44 -0700)]
am
508fedc4: Improvements to manage apps / running services:
Merge commit '
508fedc4102790dcd7004e4962e2b540967b714b' into gingerbread-plus-aosp
* commit '
508fedc4102790dcd7004e4962e2b540967b714b':
Improvements to manage apps / running services:
Dianne Hackborn [Thu, 29 Jul 2010 00:10:42 +0000 (17:10 -0700)]
Improvements to manage apps / running services:
- Running services now keeps a single data structure to make
switching through the UI a lot faster.
- Display text when there are no apps.
- Fix deadlock.
- Add new preference entry to view manage apps for storage use.
- Etc.
Change-Id: I0f5babf407ed7e84169f59584ddcb6cd0e9d67d9
Dianne Hackborn [Tue, 27 Jul 2010 23:35:13 +0000 (16:35 -0700)]
am
e7623f77: Rewrite Manage Applications to be faster and simpler.
Merge commit '
e7623f775cb37a8de049dae8c03b5b396526fdd1' into gingerbread-plus-aosp
* commit '
e7623f775cb37a8de049dae8c03b5b396526fdd1':
Rewrite Manage Applications to be faster and simpler.
Dianne Hackborn [Tue, 27 Jul 2010 21:41:34 +0000 (14:41 -0700)]
Rewrite Manage Applications to be faster and simpler.
Change-Id: I4cf405e83a369cb935bccf375798557ffd93e14e
Jean-Baptiste Queru [Mon, 26 Jul 2010 21:37:30 +0000 (14:37 -0700)]
am
46c0a5b1: Merge "Remove unused imports in SecuritySettings.java"
Merge commit '
46c0a5b12973fcd40b72b48fe344e45f1110865e' into gingerbread-plus-aosp
* commit '
46c0a5b12973fcd40b72b48fe344e45f1110865e':
Remove unused imports in SecuritySettings.java
Jean-Baptiste Queru [Mon, 26 Jul 2010 21:33:08 +0000 (14:33 -0700)]
Merge "Remove unused imports in SecuritySettings.java"
Dianne Hackborn [Mon, 26 Jul 2010 19:25:13 +0000 (12:25 -0700)]
am
938079c9: Fix drawing of phone signal chart.
Merge commit '
938079c9b36f0a45e58b5b086393647d71aebeba' into gingerbread-plus-aosp
* commit '
938079c9b36f0a45e58b5b086393647d71aebeba':
Fix drawing of phone signal chart.
Dianne Hackborn [Mon, 26 Jul 2010 19:24:59 +0000 (12:24 -0700)]
am
4d83bd2d: Add UI to report a running service to the developer.
Merge commit '
4d83bd2dbd6cd068ef770ec960c24414e8aa6391' into gingerbread-plus-aosp
* commit '
4d83bd2dbd6cd068ef770ec960c24414e8aa6391':
Add UI to report a running service to the developer.
Dianne Hackborn [Mon, 26 Jul 2010 19:24:35 +0000 (12:24 -0700)]
am
49f4ba4a: Various small UI cleanup in settings.
Merge commit '
49f4ba4adc255b812d562b7d802f91cb6d8d0671' into gingerbread-plus-aosp
* commit '
49f4ba4adc255b812d562b7d802f91cb6d8d0671':
Various small UI cleanup in settings.
Dianne Hackborn [Mon, 26 Jul 2010 19:24:31 +0000 (12:24 -0700)]
am
9db5ee35: Add facility to disable system packages.
Merge commit '
9db5ee35d5345e13e6e6b857dbad5a83e9f037d1' into gingerbread-plus-aosp
* commit '
9db5ee35d5345e13e6e6b857dbad5a83e9f037d1':
Add facility to disable system packages.
Dianne Hackborn [Mon, 26 Jul 2010 19:24:09 +0000 (12:24 -0700)]
am
cbaf6ceb: Add battery history details activity.
Merge commit '
cbaf6ceb8e6b2d36a40589de6380ff93e75335df' into gingerbread-plus-aosp
* commit '
cbaf6ceb8e6b2d36a40589de6380ff93e75335df':
Add battery history details activity.
Dianne Hackborn [Sun, 25 Jul 2010 19:41:05 +0000 (12:41 -0700)]
Fix drawing of phone signal chart.
Change-Id: I15253624ab37d3a494a541d813ee1bf2187e145d
Dianne Hackborn [Sun, 25 Jul 2010 03:04:51 +0000 (20:04 -0700)]
Add UI to report a running service to the developer.
Change-Id: Ia3f666344ee02bc96784b198533392252230bd80
Dianne Hackborn [Sun, 25 Jul 2010 00:51:23 +0000 (17:51 -0700)]
Various small UI cleanup in settings.
- Remove title bar in various places where it is not useful.
- Tighten up some text to avoid spilling across lines.
- Remove strong wording about turning off GPS to save battery.
Change-Id: Ieed9f8f3a3cf6a892a49362677594b447a266925
Dianne Hackborn [Sat, 24 Jul 2010 23:50:04 +0000 (16:50 -0700)]
Add facility to disable system packages.
Change-Id: I762c76993e0f88d255dfc04acbea6c6adea7103d
Ben Clark [Sat, 24 Jul 2010 22:06:16 +0000 (23:06 +0100)]
Remove unused imports in SecuritySettings.java
Change-Id: Ibce3dbdd8ee8a6cd1727313f3a2502717ee7f30a
Dianne Hackborn [Fri, 23 Jul 2010 07:23:21 +0000 (00:23 -0700)]
Add battery history details activity.
Adds a full-screen version of the battery history visualization,
which you can get to by tapping on the battery history chart in
the summary screen.
Change-Id: Ibca5ef3d0883ff6ffa80b6ddca3c8ac838c85842
Ben Clark [Thu, 22 Jul 2010 17:49:07 +0000 (10:49 -0700)]
am
f7f47d00: Removed unused import android.widget.LinearLayout
Merge commit '
f7f47d001b2e7faf9aacfcfe546bd209482149b8' into gingerbread-plus-aosp
* commit '
f7f47d001b2e7faf9aacfcfe546bd209482149b8':
Removed unused import android.widget.LinearLayout
Ben Clark [Wed, 21 Jul 2010 20:44:59 +0000 (21:44 +0100)]
Removed unused import android.widget.LinearLayout
Change-Id: I904f5e3a2054f99bbc7c685e9d7a805cb621819a
The Android Open Source Project [Mon, 19 Jul 2010 22:18:45 +0000 (15:18 -0700)]
merge from open-source master
Change-Id: I0a74758673231384186e810f7371900a09b73800
Ben Clark [Sat, 17 Jul 2010 18:35:56 +0000 (19:35 +0100)]
Remove unused variable and associated import
Change-Id: I5d83cf68c1604b252e860c6b3258654fcae7a589
The Android Open Source Project [Mon, 19 Jul 2010 19:52:09 +0000 (12:52 -0700)]
merge from open-source master
Change-Id: Ibdfd887cae67bb6eba26e0f4e02765ad5b07e657
Kenny Root [Mon, 21 Jun 2010 02:00:54 +0000 (19:00 -0700)]
Import revised translations
Change-Id: Iff09dd159fc2aecef68ce8b3cf26e6832865f7e5
Jiehua.Dai [Wed, 12 May 2010 06:37:52 +0000 (08:37 +0200)]
Fix window leak problems in settings.
There were window leak in the settings application.
These leak happens when an AlertDialog displays, rotate the phone,
then it would cause window leak.
Change-Id: I914897bf657933efea72eeea66076dc288098420
Irfan Sheriff [Sat, 26 Jun 2010 02:51:46 +0000 (19:51 -0700)]
am
15fe0e47: Merge "Allow soft AP settings config before bring up" into gingerbread
Merge commit '
15fe0e47958d248300c2f26a463172181b137aca' into gingerbread-plus-aosp
* commit '
15fe0e47958d248300c2f26a463172181b137aca':
Allow soft AP settings config before bring up
Irfan Sheriff [Sat, 26 Jun 2010 02:50:14 +0000 (19:50 -0700)]
Merge "Allow soft AP settings config before bring up" into gingerbread
The Android Open Source Project [Fri, 25 Jun 2010 17:02:14 +0000 (10:02 -0700)]
merge from froyo-plus-aosp
Change-Id: I006987d370377a0222dfc5b4cb24ad6441d717dc
Dianne Hackborn [Thu, 24 Jun 2010 19:42:58 +0000 (12:42 -0700)]
am
c01b0c83: Allow user to see and stop heavy-weight processes.
Merge commit '
c01b0c83fca571229621d16b757a46dc0fae7dfe' into gingerbread-plus-aosp
* commit '
c01b0c83fca571229621d16b757a46dc0fae7dfe':
Allow user to see and stop heavy-weight processes.
Dianne Hackborn [Thu, 24 Jun 2010 18:29:50 +0000 (11:29 -0700)]
Allow user to see and stop heavy-weight processes.
Change-Id: If5caed3972ab03a54fbf8c459cdfc136e4bdc020
Irfan Sheriff [Thu, 24 Jun 2010 18:31:41 +0000 (11:31 -0700)]
Allow soft AP settings config before bring up
Bug:
2538623
Change-Id: I4b927deb0e4981c164744b85e5c85c3fc95a31eb
Dianne Hackborn [Wed, 23 Jun 2010 01:04:01 +0000 (18:04 -0700)]
am
12fd447d: More battery level improvements.
Merge commit '
12fd447d6f46b0c06072b0e9735589bf14cc53f6' into gingerbread-plus-aosp
* commit '
12fd447d6f46b0c06072b0e9735589bf14cc53f6':
More battery level improvements.
Dianne Hackborn [Tue, 22 Jun 2010 23:08:50 +0000 (16:08 -0700)]
More battery level improvements.
Take into account durations when there is no data due to
a reboot. Also show times when charging and screen is on.
Change-Id: I84e75efb3339b0596bea3bbca9dbea6d9f864537
Dianne Hackborn [Mon, 21 Jun 2010 22:05:26 +0000 (15:05 -0700)]
am
f4cf7de6: Merge "Small improvements to bettery level graphing." into gingerbread
Merge commit '
f4cf7de67206be171bdc97f3f0e86cbeabd322fd' into gingerbread-plus-aosp
* commit '
f4cf7de67206be171bdc97f3f0e86cbeabd322fd':
Small improvements to bettery level graphing.
Dianne Hackborn [Mon, 21 Jun 2010 22:04:04 +0000 (15:04 -0700)]
Merge "Small improvements to bettery level graphing." into gingerbread
Dianne Hackborn [Mon, 21 Jun 2010 21:42:49 +0000 (14:42 -0700)]
Small improvements to bettery level graphing.
Deal with data that doesn't start with updates; don't try to
make lines horizontal (a battery doesn't change is a battery
that is dead!).
Change-Id: I10a7938a04cc5ed5e92a55857851d8d70b64c3b6
Kenny Root [Mon, 21 Jun 2010 20:12:02 +0000 (13:12 -0700)]
am
41e7a3cd: am
4e012037: (-s ours) Import revised translations
Merge commit '
41e7a3cd1e012e233ce69692d84356ed7f73f6d6' into gingerbread-plus-aosp
* commit '
41e7a3cd1e012e233ce69692d84356ed7f73f6d6':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 20:09:32 +0000 (13:09 -0700)]
am
4e012037: (-s ours) Import revised translations
Merge commit '
4e01203746710646227470390d4a9f7fb52c6238' into gingerbread
* commit '
4e01203746710646227470390d4a9f7fb52c6238':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 18:18:33 +0000 (11:18 -0700)]
am
4e012037: Import revised translations
Merge commit '
4e01203746710646227470390d4a9f7fb52c6238' into froyo-plus-aosp
* commit '
4e01203746710646227470390d4a9f7fb52c6238':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 18:04:50 +0000 (11:04 -0700)]
Import revised translations
Change-Id: I170f4347b73055ce204d75cfa1bef5cc22b928b1
Kenny Root [Mon, 21 Jun 2010 16:14:55 +0000 (09:14 -0700)]
am
db751db4: Import revised translations
Merge commit '
db751db4c919ea4ab981d52017b9741d386dad19' into froyo-plus-aosp
* commit '
db751db4c919ea4ab981d52017b9741d386dad19':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 16:08:46 +0000 (09:08 -0700)]
am
a4b2756f: am
db751db4: (-s ours) Import revised translations
Merge commit '
a4b2756f08740b1e7987cdd7bbafb60c84893d26' into gingerbread-plus-aosp
* commit '
a4b2756f08740b1e7987cdd7bbafb60c84893d26':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 16:02:02 +0000 (09:02 -0700)]
am
db751db4: (-s ours) Import revised translations
Merge commit '
db751db4c919ea4ab981d52017b9741d386dad19' into gingerbread
* commit '
db751db4c919ea4ab981d52017b9741d386dad19':
Import revised translations
Kenny Root [Mon, 21 Jun 2010 02:00:54 +0000 (19:00 -0700)]
Import revised translations
Change-Id: Iff09dd159fc2aecef68ce8b3cf26e6832865f7e5
Dianne Hackborn [Thu, 17 Jun 2010 02:33:51 +0000 (19:33 -0700)]
am
2f92074b: Merge "Improve battery chart, fuel gauge now shows time since charged." into gingerbread
Merge commit '
2f92074b4a4878f572be9cd39231654e1ee9003c' into gingerbread-plus-aosp
* commit '
2f92074b4a4878f572be9cd39231654e1ee9003c':
Improve battery chart, fuel gauge now shows time since charged.
Dianne Hackborn [Thu, 17 Jun 2010 02:32:09 +0000 (19:32 -0700)]
Merge "Improve battery chart, fuel gauge now shows time since charged." into gingerbread
Dianne Hackborn [Tue, 15 Jun 2010 00:18:42 +0000 (17:18 -0700)]
Improve battery chart, fuel gauge now shows time since charged.
Switch default stats to new time since charged. Update to follow
API changes. Improve the battery history chart.
Change-Id: I7de4f09ae5638ec3a034745244082e51b1369929
Dianne Hackborn [Thu, 17 Jun 2010 01:55:14 +0000 (18:55 -0700)]
am
4f0e5350: Improve battery chart, fuel gauge now shows time since charged.
Merge commit '
4f0e5350fccd78bf881b938aaf0f484d135829a0' into gingerbread-plus-aosp
* commit '
4f0e5350fccd78bf881b938aaf0f484d135829a0':
Improve battery chart, fuel gauge now shows time since charged.
Dianne Hackborn [Tue, 15 Jun 2010 00:18:42 +0000 (17:18 -0700)]
Improve battery chart, fuel gauge now shows time since charged.
Switch default stats to new time since charged. Update to follow
API changes. Improve the battery history chart.
The Android Open Source Project [Tue, 15 Jun 2010 16:36:38 +0000 (09:36 -0700)]
merge from open-source master
Change-Id: I5d1276f8343d9f590616dc2ab91e0164b2d31426
Jean-Baptiste Queru [Mon, 14 Jun 2010 23:39:36 +0000 (16:39 -0700)]
Merge "Disabled verbose logging"
The Android Open Source Project [Mon, 14 Jun 2010 21:33:13 +0000 (14:33 -0700)]
ignore from open-source master
Change-Id: I1b8bdb583dc0ad66b920f203490aa491d1e1bfb2
The Android Open Source Project [Mon, 14 Jun 2010 21:30:58 +0000 (14:30 -0700)]
merge from open-source master
Change-Id: Iaaf6c1098fc0c5a44a7450d790ccaf2b1d2f64bb
Jean-Baptiste Queru [Mon, 14 Jun 2010 19:18:24 +0000 (12:18 -0700)]
Merge "replaced deprecated setButton methods"
Jean-Baptiste Queru [Mon, 14 Jun 2010 19:13:56 +0000 (12:13 -0700)]
Merge "Replaced deprecated String Constructor"
The Android Open Source Project [Mon, 14 Jun 2010 18:48:15 +0000 (11:48 -0700)]
merge from froyo-plus-aosp
Change-Id: I6c6ee9c9567f5aef7e1beb585296c1e2fb884e9a
The Android Open Source Project [Mon, 14 Jun 2010 18:08:28 +0000 (11:08 -0700)]
merge from open-source master
Change-Id: Ia3beb8e68dd6a8df1b2c8887c0b851b4467b5f79
Jean-Baptiste Queru [Mon, 14 Jun 2010 17:25:34 +0000 (10:25 -0700)]
Merge "replaced deprecated getIntent with parseURI"
The Android Open Source Project [Fri, 11 Jun 2010 20:31:28 +0000 (13:31 -0700)]
merge from open-source master
Change-Id: I7d167c97600bbf25e2ed8872cffecd9fa5b1db7c
Dianne Hackborn [Fri, 11 Jun 2010 17:25:54 +0000 (10:25 -0700)]
Show history of battery level.
Also clean up to remove dead code for running services and old
battery usage UI.
Finally some string improvements from Roy.
Change-Id: I8765a4c744b92edd1505f14c47fea57b918e5d7b
Anders Hammar1 [Thu, 8 Apr 2010 08:03:50 +0000 (10:03 +0200)]
Settings: Add a hook for operator or vendor specific settings.
The Settings application now provides a hook that can be used by an
operator or a vendor specific application to add an activity of choice
in the settings menu.
Change-Id: Id55da9fd4262bbfc6a5abf863799c747b0d75b24
Kenny Root [Thu, 10 Jun 2010 18:54:49 +0000 (11:54 -0700)]
am
dc2fdd09: (-s ours) Import revised translations
Merge commit '
dc2fdd091fc23fe4d4001cc5caacdddbd6becddd' into kraken
* commit '
dc2fdd091fc23fe4d4001cc5caacdddbd6becddd':
Import revised translations
Kenny Root [Thu, 10 Jun 2010 18:48:13 +0000 (11:48 -0700)]
am
dc2fdd09: Import revised translations
Merge commit '
dc2fdd091fc23fe4d4001cc5caacdddbd6becddd' into froyo-plus-aosp
* commit '
dc2fdd091fc23fe4d4001cc5caacdddbd6becddd':
Import revised translations
Kenny Root [Thu, 10 Jun 2010 18:36:34 +0000 (11:36 -0700)]
Import revised translations
Change-Id: I927a602963d383fbfe12d4b897a2e86bf1783f34