OSDN Git Service
Daisuke Miyakawa [Fri, 13 Aug 2010 20:52:43 +0000 (13:52 -0700)]
Merge "Create LocalePickerFragment for fragmentizing LocalePicker Activity."
Daisuke Miyakawa [Thu, 12 Aug 2010 20:04:43 +0000 (13:04 -0700)]
Create LocalePickerFragment for fragmentizing LocalePicker Activity.
Need to add proguard.flag, as the Activity crashes without it.
Change-Id: Icbc75be4a4183920ed472ac64cc509115260f865
Jean-Baptiste Queru [Thu, 12 Aug 2010 21:34:33 +0000 (14:34 -0700)]
am
f9cfab20: Fix build - add missing import
Merge commit '
f9cfab203a61346b86373a91ca239b624c7106c7'
* commit '
f9cfab203a61346b86373a91ca239b624c7106c7':
Fix build - add missing import
Jean-Baptiste Queru [Thu, 12 Aug 2010 21:30:26 +0000 (14:30 -0700)]
Fix build - add missing import
Change-Id: I31c5db903532c68b42760f29b3fbb46c7c7854f8
Daisuke Miyakawa [Thu, 12 Aug 2010 19:22:05 +0000 (12:22 -0700)]
Merge "Remove LocalePickerInSetupWizard."
Irfan Sheriff [Thu, 12 Aug 2010 14:59:25 +0000 (07:59 -0700)]
Merge "asynchronous API changes"
Dianne Hackborn [Thu, 12 Aug 2010 05:34:43 +0000 (22:34 -0700)]
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
Daisuke Miyakawa [Thu, 12 Aug 2010 01:12:32 +0000 (18:12 -0700)]
Remove LocalePickerInSetupWizard.
Currently LocalePicker and LocalePickerInSetupWizard are identical and
the latter is not used at all. Let's remove it.
Change-Id: I951433350a7ead5c0b7036e84b609424ad0d0898
Irfan Sheriff [Mon, 9 Aug 2010 23:48:07 +0000 (16:48 -0700)]
asynchronous API changes
Use the simplified connect, save & remove async API
Change-Id: I5754f1772163bcb4ab0ae18cab3747e17c21531a
Eric Fischer [Tue, 10 Aug 2010 19:20:53 +0000 (12:20 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 10 Aug 2010 19:13:01 +0000 (12:13 -0700)]
Import revised translations.
Change-Id: Ib5a34ef0ce1f4639a4744efbc401788982ad43b3
Eric Fischer [Tue, 10 Aug 2010 19:04:00 +0000 (12:04 -0700)]
am
cd361907: (-s ours) am
38f15782: Import revised translations. DO NOT MERGE
Merge commit '
cd361907d510224da4eceba8dd7958f0ddc5d55d'
* commit '
cd361907d510224da4eceba8dd7958f0ddc5d55d':
Import revised translations. DO NOT MERGE
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 [Thu, 5 Aug 2010 23:09:45 +0000 (16:09 -0700)]
Import revised translations.
Change-Id: I0b805e4c7d2cedf70ec4ca5309f2a8073010fa51
Vasu Nori [Thu, 5 Aug 2010 19:16:31 +0000 (12:16 -0700)]
Merge "if requery returns false, throw exception"
Eric Fischer [Thu, 5 Aug 2010 18:45:09 +0000 (11:45 -0700)]
am
8e2193c6: (-s ours) am
4d9d75a4: Import revised translations. DO NOT MERGE
Merge commit '
8e2193c6d03fdf7b109aed375c197446b91204f6'
* commit '
8e2193c6d03fdf7b109aed375c197446b91204f6':
Import revised translations. DO NOT MERGE
Vasu Nori [Thu, 5 Aug 2010 18:32:54 +0000 (11:32 -0700)]
if requery returns false, throw exception
bug:
2894145
Change-Id: Iba36031fae90e53a6c71677e3ec23ba017234407
Oscar Montemayor [Tue, 3 Aug 2010 23:56:09 +0000 (16:56 -0700)]
Enabling users toset the Global Proxy from wireless settings.
Change-Id: Ie9b37e4c8e042fab738d2181878e93d7d2645834
Irfan Sheriff [Wed, 4 Aug 2010 18:50:43 +0000 (11:50 -0700)]
Merge "Increase scan time in settings"
Irfan Sheriff [Wed, 4 Aug 2010 18:27:42 +0000 (11:27 -0700)]
Increase scan time in settings
With the combo scan on all bands taking about 5-6s,
increase scan time in settings to 10s.
Change-Id: Ie98605a211dcb149b3bbd2c723bc10352e207cc3
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
Gilles Debunne [Wed, 4 Aug 2010 01:37:34 +0000 (18:37 -0700)]
Generated hdpi drawable size reduced
Change-Id: I1f181d46fba25a1af9e68281687d330cb547409e
Gilles Debunne [Tue, 3 Aug 2010 17:57:49 +0000 (10:57 -0700)]
Merge "packages/apps/Settings/ : added scaled hdpi version of assets that were moved to drawable-mdpi"
Gilles Debunne [Tue, 3 Aug 2010 17:47:35 +0000 (10:47 -0700)]
packages/apps/Settings/ : added scaled hdpi version of assets that were moved to drawable-mdpi
Change-Id: Ie5b884dd54a21d41467e3da9f7a5e499ee5d3245
Irfan Sheriff [Tue, 3 Aug 2010 15:29:09 +0000 (08:29 -0700)]
Merge "Keep airplane mode UI & system settings in sync"
Irfan Sheriff [Tue, 3 Aug 2010 02:11:16 +0000 (19:11 -0700)]
Keep airplane mode UI & system settings in sync
If mobile radio bring up/down fails, airplane mode UI & system settings
go out of sync and this prevents wifi from being brought up on every
reboot.
Bug:
2887841
Change-Id: Id0f1299e6b4e2c28b72c8fb8d853dad3fcaceaa7
Gilles Debunne [Mon, 2 Aug 2010 21:46:53 +0000 (14:46 -0700)]
Move pngs from drawable to drawable-mdpi in project packages/apps/Settings
Change-Id: I977a79934596ddd05e1bb86093c19dbd4bb6463c
Dianne Hackborn [Fri, 30 Jul 2010 22:30:05 +0000 (15:30 -0700)]
am
a3be8640: am
0f9daab7: Manage apps "third party" and "on sd card" filters were swapped.
Merge commit '
a3be864081ece005cf378ba8878063218cb1a131'
* commit '
a3be864081ece005cf378ba8878063218cb1a131':
Manage apps "third party" and "on sd card" filters were swapped.
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
Dianne Hackborn [Thu, 29 Jul 2010 00:46:32 +0000 (17:46 -0700)]
am
6fce81a6: am
508fedc4: Improvements to manage apps / running services:
Merge commit '
6fce81a69d7c2891d31618016c8ddc7b08deaa03'
* commit '
6fce81a69d7c2891d31618016c8ddc7b08deaa03':
Improvements to manage apps / running services:
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:59:32 +0000 (16:59 -0700)]
am
9248082d: am
e7623f77: Rewrite Manage Applications to be faster and simpler.
Merge commit '
9248082d0a19a1d1c9b2d70e0be8f78e38ecc657'
* commit '
9248082d0a19a1d1c9b2d70e0be8f78e38ecc657':
Rewrite Manage Applications to be faster and simpler.
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
Mike Dodd [Mon, 26 Jul 2010 22:16:03 +0000 (15:16 -0700)]
Fix build.
Change-Id: I9982c3b1a7f844af82513012a267f2efb14a5031
Jean-Baptiste Queru [Mon, 26 Jul 2010 21:41:52 +0000 (14:41 -0700)]
am
885ac770: am
46c0a5b1: Merge "Remove unused imports in SecuritySettings.java"
Merge commit '
885ac7701fc809276aed1be151b9ecd8bd0a1cd3'
* commit '
885ac7701fc809276aed1be151b9ecd8bd0a1cd3':
Remove unused imports in SecuritySettings.java
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:29:44 +0000 (12:29 -0700)]
am
2e8bf1aa: am
938079c9: Fix drawing of phone signal chart.
Merge commit '
2e8bf1aa8291f8b0523b052d94cf1fcd6bf65cc7'
* commit '
2e8bf1aa8291f8b0523b052d94cf1fcd6bf65cc7':
Fix drawing of phone signal chart.
Dianne Hackborn [Mon, 26 Jul 2010 19:29:42 +0000 (12:29 -0700)]
am
bc77ddbc: am
4d83bd2d: Add UI to report a running service to the developer.
Merge commit '
bc77ddbcf5981557eb87bf65d6d09ef455efb773'
* commit '
bc77ddbcf5981557eb87bf65d6d09ef455efb773':
Add UI to report a running service to the developer.
Dianne Hackborn [Mon, 26 Jul 2010 19:29:40 +0000 (12:29 -0700)]
am
77ba65ea: am
49f4ba4a: Various small UI cleanup in settings.
Merge commit '
77ba65eaec3587ad9fcdeea5e6937c8821838add'
* commit '
77ba65eaec3587ad9fcdeea5e6937c8821838add':
Various small UI cleanup in settings.
Dianne Hackborn [Mon, 26 Jul 2010 19:29:38 +0000 (12:29 -0700)]
am
4d4ccc9a: am
9db5ee35: Add facility to disable system packages.
Merge commit '
4d4ccc9acbf9c46c930129fcb98230886dac5b9f'
* commit '
4d4ccc9acbf9c46c930129fcb98230886dac5b9f':
Add facility to disable system packages.
Dianne Hackborn [Mon, 26 Jul 2010 19:29:35 +0000 (12:29 -0700)]
am
e5d948f3: am
cbaf6ceb: Add battery history details activity.
Merge commit '
e5d948f333b78061076c7764d641b84c8751b2c9'
* commit '
e5d948f333b78061076c7764d641b84c8751b2c9':
Add battery history details activity.
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:51:45 +0000 (10:51 -0700)]
am
84c27eec: am
f7f47d00: Removed unused import android.widget.LinearLayout
Merge commit '
84c27eecddf856544528c4835282ac4c3b3b20af'
* commit '
84c27eecddf856544528c4835282ac4c3b3b20af':
Removed unused import android.widget.LinearLayout
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:20:32 +0000 (15:20 -0700)]
am
a3b8c7a5: merge from open-source master
Merge commit '
a3b8c7a5e77f1518034a8ab911af405f30c11b06'
* commit '
a3b8c7a5e77f1518034a8ab911af405f30c11b06':
Remove unused variable and associated import
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 20:01:37 +0000 (13:01 -0700)]
am
be38a39f: merge from open-source master
Merge commit '
be38a39fc98d8574b747c57fea2aedd5d97fd333'
* commit '
be38a39fc98d8574b747c57fea2aedd5d97fd333':
Fix window leak problems in settings.
The Android Open Source Project [Mon, 19 Jul 2010 19:52:09 +0000 (12:52 -0700)]
merge from open-source master
Change-Id: Ibdfd887cae67bb6eba26e0f4e02765ad5b07e657
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:53:30 +0000 (19:53 -0700)]
am
40686ee8: am
15fe0e47: Merge "Allow soft AP settings config before bring up" into gingerbread
Merge commit '
40686ee81f95699d7a83ccb1ef1be52c0c746d4f'
* commit '
40686ee81f95699d7a83ccb1ef1be52c0c746d4f':
Allow soft AP settings config before bring up
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 21:21:27 +0000 (14:21 -0700)]
am
c9d2f15f: merge from froyo-plus-aosp
Merge commit '
c9d2f15fc5012066b62f5a59aff5c7aaf283c491'
* commit '
c9d2f15fc5012066b62f5a59aff5c7aaf283c491':
Disabled verbose logging
replaced deprecated setButton methods
Replaced deprecated String Constructor
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:44:37 +0000 (12:44 -0700)]
am
15f9939b: am
c01b0c83: Allow user to see and stop heavy-weight processes.
Merge commit '
15f9939b84542319fee7039b55dacb77d1fc2789'
* commit '
15f9939b84542319fee7039b55dacb77d1fc2789':
Allow user to see and stop heavy-weight processes.
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 19:41:20 +0000 (12:41 -0700)]
am
fe53d788: am
12fd447d: More battery level improvements.
Merge commit '
fe53d78858c4d853cb82394d44740769241f70bf'
* commit '
fe53d78858c4d853cb82394d44740769241f70bf':
More battery level improvements.
Dianne Hackborn [Wed, 23 Jun 2010 17:17:31 +0000 (10:17 -0700)]
am
0bd7082e: am
f4cf7de6: Merge "Small improvements to bettery level graphing." into gingerbread
Merge commit '
0bd7082ef809de2aec50fc347ee0974dbc52d764'
* commit '
0bd7082ef809de2aec50fc347ee0974dbc52d764':
Small improvements to bettery level graphing.
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
Adam Powell [Tue, 8 Jun 2010 00:13:10 +0000 (17:13 -0700)]
Add keyboard support to bluetooth settings.
Change-Id: I8fe41056acd074374cd249bfd0be6034f2614d37
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:48:00 +0000 (13:48 -0700)]
am
f8865183: am
41e7a3cd: am
4e012037: (-s ours) Import revised translations
Merge commit '
f88651835f2c750d5f7ff286a7b7803f2544bec7'
* commit '
f88651835f2c750d5f7ff286a7b7803f2544bec7':
Import revised translations
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 17:16:39 +0000 (10:16 -0700)]
am
eda02799: am
a4b2756f: am
db751db4: (-s ours) Import revised translations
Merge commit '
eda027990897858840753c16c5e3b47a4979a1e6'
* commit '
eda027990897858840753c16c5e3b47a4979a1e6':
Import revised translations
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
Robert Greenwalt [Thu, 17 Jun 2010 22:16:32 +0000 (15:16 -0700)]
Merge "Don't enable USB Tethering UI for monkeys."
Dianne Hackborn [Thu, 17 Jun 2010 02:55:22 +0000 (19:55 -0700)]
am
fffb1dff: am
2f92074b: Merge "Improve battery chart, fuel gauge now shows time since charged." into gingerbread
Merge commit '
fffb1dffd44decffbff74815b4923e82a8e6a29c'
* commit '
fffb1dffd44decffbff74815b4923e82a8e6a29c':
Improve battery chart, fuel gauge now shows time since charged.
Dianne Hackborn [Thu, 17 Jun 2010 02:55:18 +0000 (19:55 -0700)]
am
a5edf683: am
4f0e5350: Improve battery chart, fuel gauge now shows time since charged.
Merge commit '
a5edf6834627c57d9674dd50f01dd3755541d8b1'
* commit '
a5edf6834627c57d9674dd50f01dd3755541d8b1':
Improve battery chart, fuel gauge now shows time since charged.
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.
OSDN Git Service
