OSDN Git Service
Dianne Hackborn [Wed, 1 Sep 2010 02:06:15 +0000 (19:06 -0700)]
am
16339b6f: am
5774d5d3: Show correct process dependency for providers.
Merge commit '
16339b6f3515684cc02c422c52ec189eda0d30b3'
* commit '
16339b6f3515684cc02c422c52ec189eda0d30b3':
Show correct process dependency for providers.
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
Mike Lockwood [Tue, 31 Aug 2010 20:47:29 +0000 (13:47 -0700)]
Merge "Add checkbox to enable PTP USB mode."
Mike Lockwood [Tue, 31 Aug 2010 18:38:44 +0000 (14:38 -0400)]
Add checkbox to enable PTP USB mode.
Change-Id: Icb139cc3d1077565fb8dbe9917d87c7337f59797
Signed-off-by: Mike Lockwood <lockwood@android.com>
Robert Greenwalt [Mon, 30 Aug 2010 22:33:28 +0000 (15:33 -0700)]
Use change of NetworkProperties to LinkProperties
Change-Id: Ib792cec1d210151fe904f892663ff59ae4e88f54
Eric Fischer [Mon, 30 Aug 2010 21:21:59 +0000 (14:21 -0700)]
Merge "Import revised translations"
Eric Fischer [Mon, 30 Aug 2010 20:40:26 +0000 (13:40 -0700)]
Import revised translations
Change-Id: I5ff43233cd7017d36238fe17384585cb3938e081
Brad Fitzpatrick [Mon, 30 Aug 2010 20:29:29 +0000 (13:29 -0700)]
am
6442f0b4: am
22aa2130: Merge "Make power control widget be more responsive. Fix StrictMode violations." into gingerbread
Merge commit '
6442f0b466c64f1cf61f3f4c89ce205c4030963e'
* commit '
6442f0b466c64f1cf61f3f4c89ce205c4030963e':
Make power control widget be more responsive. Fix StrictMode violations.
Eric Fischer [Mon, 30 Aug 2010 20:29:25 +0000 (13:29 -0700)]
am
27521a0d: (-s ours) am
92669a51: Import revised translations. DO NOT MERGE
Merge commit '
27521a0defd769aa389b4bc56fbe02cb1a5ce092'
* commit '
27521a0defd769aa389b4bc56fbe02cb1a5ce092':
Import revised translations. DO NOT MERGE
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
Daisuke Miyakawa [Tue, 24 Aug 2010 22:50:43 +0000 (15:50 -0700)]
Make LocalePicker Fragment.
The logic calling selectFirst() is removed as
- There's no comment why it is needed.
- Actually SetupWizard gets stack as that forces users to see
WirelessSettings in SetupWizard.
The other changes:
- Move back LocalePickerFragment to LocalePicker.
- Make <activity> for LocalePicker in AndroidManifest <activity-alias>
- Add a short comment about how getComponent(), which should be a key
for understanding how top-level settings work.
- Modify LanguageSettings so that it corectly points LocalePicker as
a fragment.
Change-Id: I78d356e40af896ba1aab72fba12c90467371c7b0
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
Wink Saville [Fri, 27 Aug 2010 20:53:26 +0000 (13:53 -0700)]
Use NetworkProperties instead of the accessor functions of phone.
Change-Id: I6e81bb8be25fc17c978da3900470061d82c3b3fb
Joe Onorato [Fri, 27 Aug 2010 19:20:32 +0000 (15:20 -0400)]
Fix the build.
Change-Id: I74c288fadd21c918aad379dbde1ad9725ad1c459
Daisuke Miyakawa [Thu, 26 Aug 2010 00:52:30 +0000 (17:52 -0700)]
Merge "Fragmentize WifiSettings."
Jean-Michel Trivi [Thu, 26 Aug 2010 00:34:36 +0000 (17:34 -0700)]
am
b3d90b60: am
a457719c: Add new string for the notification to be displayed when the user installs a new TTS engine.
Merge commit '
b3d90b604b37dd9c32799832c43882a4cbf3199d'
* commit '
b3d90b604b37dd9c32799832c43882a4cbf3199d':
Add new string for the notification to be displayed when the user
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
Daisuke Miyakawa [Wed, 25 Aug 2010 18:58:37 +0000 (11:58 -0700)]
Fragmentize WifiSettings.
- Add button bar feature toward SettingsPreferenceFragment,
which has existed in PreferenceActivity and has been used
(probably) only by Settings app.
- super.onActivityCreated() is not called at the beggining of
WifiSettings#onActivityCreated(), the parent method assumes
the child should have prepared PreferenceScreen, while
WifiSettings cannot do until the parent Activity is ready.
- Call SetHasOptionMenu() should be called AFTER the parent
Activity is ready. It is not documented, so it would be better
to file another bug.
- Add exception to proguard...
Change-Id: Iebd27f0cb0abdbee9b4b1cc9b00f4bf127f7815d
Jean-Baptiste Queru [Tue, 24 Aug 2010 18:55:38 +0000 (11:55 -0700)]
am
41357ba8: am
02e731fb: merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
Merge commit '
41357ba8d6f2eae906a2af19a7296f47dbc6d286'
* commit '
41357ba8d6f2eae906a2af19a7296f47dbc6d286':
Import revised translations
Kenny Root [Tue, 24 Aug 2010 17:13:00 +0000 (10:13 -0700)]
resolved conflicts for merge of
dbdbd152 to master
Change-Id: Icb172e3d8c2eaec8156bdc37d12efb238054b507
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
Jaikumar Ganesh [Mon, 23 Aug 2010 22:58:37 +0000 (15:58 -0700)]
Merge "Match devices by Class for tethering."
Dianne Hackborn [Mon, 23 Aug 2010 19:01:51 +0000 (12:01 -0700)]
Jaikumar Ganesh [Mon, 23 Aug 2010 18:20:48 +0000 (11:20 -0700)]
Match devices by Class for tethering.
Change-Id: I711de3c8d6f6b1dafeec4fb5dde4fa33d997bcca
Jake Hamby [Sat, 21 Aug 2010 16:35:49 +0000 (09:35 -0700)]
am
2876ad62: am
2fcfb289: Merge " Fix Bluetooth Settings activity memory leak."
Merge commit '
2876ad62082207e0e02cbc38b65ce9993cb121bf'
* commit '
2876ad62082207e0e02cbc38b65ce9993cb121bf':
Fix Bluetooth Settings activity memory leak.
Dianne Hackborn [Sat, 21 Aug 2010 16:35:38 +0000 (09:35 -0700)]
am
4962c855: am
a712c3b7: A couple small settings fixes:
Merge commit '
4962c855b871f1657ca6d90817567203e6863551'
* commit '
4962c855b871f1657ca6d90817567203e6863551':
A couple small settings fixes:
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
Eric Fischer [Thu, 19 Aug 2010 19:01:34 +0000 (12:01 -0700)]
Merge "Import Romansh translations."
Amith Yamasani [Thu, 19 Aug 2010 17:24:08 +0000 (10:24 -0700)]
Fix proguard flags for settings.
Bug:
2933151
Amith Yamasani [Wed, 18 Aug 2010 20:59:28 +0000 (13:59 -0700)]
Refactor settings top level activities to use fragments.
Added a base class SettingsPreferenceFragment from which the settings activities should
be derived so that they can behave like fragments. It contains some commonly called
utility methods and dialog conversion to DialogFragment.
Some of the top-level activities can be launched directly without the left pane.
Settings.java acts as a proxy activity that contains just that settings fragment without
the left pane.
There are still a lot of second and third level activities that need to be fragmentized.
This is just the first pass to test the 2-pane layout.
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
Danica Chang [Wed, 18 Aug 2010 23:58:52 +0000 (16:58 -0700)]
Merge "bluetooth tethering"
Eric Fischer [Wed, 18 Aug 2010 23:26:49 +0000 (16:26 -0700)]
Import Romansh translations.
Change-Id: I71df0c212e4ef30c94bc36d048226c3216f79e9b
Eric Fischer [Wed, 18 Aug 2010 20:43:18 +0000 (13:43 -0700)]
am
e86ec30f: (-s ours) am
f8a91b53: Import revised translations. DO NOT MERGE
Merge commit '
e86ec30f3fc916f32e9c3e58d1f026a10f9b265f'
* commit '
e86ec30f3fc916f32e9c3e58d1f026a10f9b265f':
Import revised translations. DO NOT MERGE
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
Danica Chang [Wed, 11 Aug 2010 01:41:29 +0000 (18:41 -0700)]
bluetooth tethering
Change-Id: I8dfb1c85bb8b963d2937b8bc4a4c9f0cf641785d
Eric Fischer [Tue, 17 Aug 2010 23:56:21 +0000 (16:56 -0700)]
Import revised translations.
Change-Id: I22bb0d58dabccd19a4726c5abf97710f1970c211
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:51:35 +0000 (07:51 -0700)]
am
8d62eb4a: am
0008d219: Refactor to remove multiple in-loop Object[]->String[] castings
Merge commit '
8d62eb4a51141f4464ba0b4c510cf0ec4198a56a'
* commit '
8d62eb4a51141f4464ba0b4c510cf0ec4198a56a':
Refactor to remove multiple in-loop Object[]->String[] castings
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 22:18:30 +0000 (15:18 -0700)]
am
6ca1da8c: am
ff3673c7: Make running services initial update async.
Merge commit '
6ca1da8c97f76f1b07fc70846ae31e22fb72c160'
* commit '
6ca1da8c97f76f1b07fc70846ae31e22fb72c160':
Make running services initial update async.
Dianne Hackborn [Mon, 16 Aug 2010 22:17:36 +0000 (15:17 -0700)]
am
343158c7: am
be5994d2: Some improvements to the battery usage UI:
Merge commit '
343158c797ea12f3f43df2a0ec70c65ada9e6daa'
* commit '
343158c797ea12f3f43df2a0ec70c65ada9e6daa':
Some improvements to the battery usage UI:
Daisuke Miyakawa [Mon, 16 Aug 2010 02:33:39 +0000 (19:33 -0700)]
Tiny fix: remove warnings in WifiApiDialog.
Change-Id: Ifff3dd5d0a98e0be5bbe97c11fe4441bccfa6d09
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
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
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: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.