OSDN Git Service

android-x86/packages-apps-Settings.git
14 years agoam 805ad7d1: am 4749fcf7: More tricksy.
Dianne Hackborn [Mon, 23 Aug 2010 19:01:51 +0000 (12:01 -0700)]
am 805ad7d1: am 4749fcf7: More tricksy.

Merge commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d'

* commit '805ad7d1aa3d5177b383af3ad49df20092d2ef9d':
  More tricksy.

14 years agoam 2876ad62: am 2fcfb289: Merge " Fix Bluetooth Settings activity memory leak."
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.

14 years agoam 4962c855: am a712c3b7: A couple small settings fixes:
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:

14 years agoam 4749fcf7: More tricksy.
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.

14 years agoMore tricksy.
Dianne Hackborn [Fri, 20 Aug 2010 01:11:51 +0000 (18:11 -0700)]
More tricksy.

Change-Id: I4752344e0eea302ba28e907ff5bd5c20f74a82b7

14 years agoMerge "Import Romansh translations."
Eric Fischer [Thu, 19 Aug 2010 19:01:34 +0000 (12:01 -0700)]
Merge "Import Romansh translations."

14 years agoFix proguard flags for settings.
Amith Yamasani [Thu, 19 Aug 2010 17:24:08 +0000 (10:24 -0700)]
Fix proguard flags for settings.

Bug: 2933151

14 years agoRefactor settings top level activities to use fragments.
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.

14 years agoam 2fcfb289: Merge " Fix Bluetooth Settings activity memory leak."
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.

14 years agoMerge " 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."

14 years agoam a712c3b7: A couple small settings fixes:
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:

14 years agoA 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

14 years agoMerge "bluetooth tethering"
Danica Chang [Wed, 18 Aug 2010 23:58:52 +0000 (16:58 -0700)]
Merge "bluetooth tethering"

14 years agoImport Romansh translations.
Eric Fischer [Wed, 18 Aug 2010 23:26:49 +0000 (16:26 -0700)]
Import Romansh translations.

Change-Id: I71df0c212e4ef30c94bc36d048226c3216f79e9b

14 years agoam e86ec30f: (-s ours) am f8a91b53: Import revised translations. DO NOT MERGE
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

14 years agoam f8a91b53: 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

14 years agobluetooth tethering
Danica Chang [Wed, 11 Aug 2010 01:41:29 +0000 (18:41 -0700)]
bluetooth tethering

Change-Id: I8dfb1c85bb8b963d2937b8bc4a4c9f0cf641785d

14 years agoImport revised translations.
Eric Fischer [Tue, 17 Aug 2010 23:56:21 +0000 (16:56 -0700)]
Import revised translations.

Change-Id: I22bb0d58dabccd19a4726c5abf97710f1970c211

14 years agoImport 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

14 years ago Fix Bluetooth Settings activity memory leak.
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.

14 years agoam 8d62eb4a: am 0008d219: Refactor to remove multiple in-loop Object[]->String[]...
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

14 years agoam 0008d219: 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

14 years agoam 6ca1da8c: am ff3673c7: Make running services initial update async.
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.

14 years agoam 343158c7: am be5994d2: Some improvements to the battery usage UI:
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:

14 years agoTiny fix: remove warnings in WifiApiDialog.
Daisuke Miyakawa [Mon, 16 Aug 2010 02:33:39 +0000 (19:33 -0700)]
Tiny fix: remove warnings in WifiApiDialog.

Change-Id: Ifff3dd5d0a98e0be5bbe97c11fe4441bccfa6d09

14 years agoam ff3673c7: Make running services initial update async.
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.

14 years agoMake 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

14 years agoam be5994d2: Some improvements to the battery usage UI:
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:

14 years agoSome 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

14 years agoMerge "Create LocalePickerFragment for fragmentizing LocalePicker Activity."
Daisuke Miyakawa [Fri, 13 Aug 2010 20:52:43 +0000 (13:52 -0700)]
Merge "Create LocalePickerFragment for fragmentizing LocalePicker Activity."

14 years agoCreate 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

14 years agoam f9cfab20: Fix build - add missing import
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

14 years agoFix 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

14 years agoMerge "Remove LocalePickerInSetupWizard."
Daisuke Miyakawa [Thu, 12 Aug 2010 19:22:05 +0000 (12:22 -0700)]
Merge "Remove LocalePickerInSetupWizard."

14 years agoMerge "asynchronous API changes"
Irfan Sheriff [Thu, 12 Aug 2010 14:59:25 +0000 (07:59 -0700)]
Merge "asynchronous API changes"

14 years agoam 0e404872: am 36735462: More version info.
Dianne Hackborn [Thu, 12 Aug 2010 05:34:43 +0000 (22:34 -0700)]
am 0e404872: am 36735462: More version info.

Merge commit '0e4048721980926ed9f78de955658eb5d07dcfc4'

* commit '0e4048721980926ed9f78de955658eb5d07dcfc4':
  More version info.

14 years agoam 36735462: More version info.
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.

14 years agoMore version info.
Dianne Hackborn [Thu, 12 Aug 2010 05:28:29 +0000 (22:28 -0700)]
More version info.

Change-Id: I006951028135e95ce7bb2463f00649a691b5f615

14 years agoRemove LocalePickerInSetupWizard.
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

14 years agoasynchronous API changes
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

14 years agoMerge "Import revised translations."
Eric Fischer [Tue, 10 Aug 2010 19:20:53 +0000 (12:20 -0700)]
Merge "Import revised translations."

14 years agoImport revised translations.
Eric Fischer [Tue, 10 Aug 2010 19:13:01 +0000 (12:13 -0700)]
Import revised translations.

Change-Id: Ib5a34ef0ce1f4639a4744efbc401788982ad43b3

14 years agoam cd361907: (-s ours) am 38f15782: Import revised translations. DO NOT MERGE
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

14 years agoam 38f15782: 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

14 years agoImport 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

14 years agoImport revised translations.
Eric Fischer [Thu, 5 Aug 2010 23:09:45 +0000 (16:09 -0700)]
Import revised translations.

Change-Id: I0b805e4c7d2cedf70ec4ca5309f2a8073010fa51

14 years agoMerge "if requery returns false, throw exception"
Vasu Nori [Thu, 5 Aug 2010 19:16:31 +0000 (12:16 -0700)]
Merge "if requery returns false, throw exception"

14 years agoam 8e2193c6: (-s ours) am 4d9d75a4: Import revised translations. DO NOT MERGE
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

14 years agoif requery returns false, throw exception
Vasu Nori [Thu, 5 Aug 2010 18:32:54 +0000 (11:32 -0700)]
if requery returns false, throw exception

bug:2894145
Change-Id: Iba36031fae90e53a6c71677e3ec23ba017234407

14 years agoEnabling users toset the Global Proxy from wireless settings.
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

14 years agoMerge "Increase scan time in settings"
Irfan Sheriff [Wed, 4 Aug 2010 18:50:43 +0000 (11:50 -0700)]
Merge "Increase scan time in settings"

14 years agoIncrease 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

14 years agoam 4d9d75a4: Import revised translations. DO NOT MERGE
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

14 years agoImport 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

14 years agoGenerated hdpi drawable size reduced
Gilles Debunne [Wed, 4 Aug 2010 01:37:34 +0000 (18:37 -0700)]
Generated hdpi drawable size reduced

Change-Id: I1f181d46fba25a1af9e68281687d330cb547409e

14 years agoMerge "packages/apps/Settings/ : added scaled hdpi version of assets that were moved...
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"

14 years agopackages/apps/Settings/ : added scaled hdpi version of assets that were moved to...
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

14 years agoMerge "Keep airplane mode UI & system settings in sync"
Irfan Sheriff [Tue, 3 Aug 2010 15:29:09 +0000 (08:29 -0700)]
Merge "Keep airplane mode UI & system settings in sync"

14 years agoKeep 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

14 years agoMove pngs from drawable to drawable-mdpi in project packages/apps/Settings
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

14 years agoam a3be8640: am 0f9daab7: Manage apps "third party" and "on sd card" filters were...
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.

14 years agoam 0f9daab7: 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.

14 years agoManage 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

14 years agoRefactor to remove multiple in-loop Object[]->String[] castings
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

14 years agoam 6fce81a6: am 508fedc4: Improvements to manage apps / running services:
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:

14 years agoam 508fedc4: 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:

14 years agoImprovements 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

14 years agoam 9248082d: am e7623f77: Rewrite Manage Applications to be faster and simpler.
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.

14 years agoam e7623f77: 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.

14 years agoRewrite 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

14 years agoFix build.
Mike Dodd [Mon, 26 Jul 2010 22:16:03 +0000 (15:16 -0700)]
Fix build.

Change-Id: I9982c3b1a7f844af82513012a267f2efb14a5031

14 years agoam 885ac770: am 46c0a5b1: Merge "Remove unused imports in SecuritySettings.java"
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

14 years agoam 46c0a5b1: Merge "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

14 years agoMerge "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"

14 years agoam 2e8bf1aa: am 938079c9: Fix drawing of phone signal chart.
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.

14 years agoam bc77ddbc: am 4d83bd2d: Add UI to report a running service to the developer.
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.

14 years agoam 77ba65ea: am 49f4ba4a: Various small UI cleanup in settings.
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.

14 years agoam 4d4ccc9a: am 9db5ee35: Add facility to disable system packages.
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.

14 years agoam e5d948f3: am cbaf6ceb: Add battery history details activity.
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.

14 years agoam 938079c9: Fix drawing of phone signal chart.
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.

14 years agoam 4d83bd2d: Add UI to report a running service to the developer.
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.

14 years agoam 49f4ba4a: Various small UI cleanup in settings.
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.

14 years agoam 9db5ee35: Add facility to disable system packages.
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.

14 years agoam cbaf6ceb: Add battery history details activity.
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.

14 years agoFix drawing of phone signal chart.
Dianne Hackborn [Sun, 25 Jul 2010 19:41:05 +0000 (12:41 -0700)]
Fix drawing of phone signal chart.

Change-Id: I15253624ab37d3a494a541d813ee1bf2187e145d

14 years agoAdd UI to report a running service to the developer.
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

14 years agoVarious small UI cleanup in settings.
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

14 years agoAdd facility to disable system packages.
Dianne Hackborn [Sat, 24 Jul 2010 23:50:04 +0000 (16:50 -0700)]
Add facility to disable system packages.

Change-Id: I762c76993e0f88d255dfc04acbea6c6adea7103d

14 years agoRemove unused imports in SecuritySettings.java
Ben Clark [Sat, 24 Jul 2010 22:06:16 +0000 (23:06 +0100)]
Remove unused imports in SecuritySettings.java

Change-Id: Ibce3dbdd8ee8a6cd1727313f3a2502717ee7f30a

14 years agoAdd battery history details activity.
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

14 years agoam 84c27eec: am f7f47d00: Removed unused import android.widget.LinearLayout
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

14 years agoam f7f47d00: 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

14 years agoRemoved 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

14 years agoam a3b8c7a5: merge from open-source master
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

14 years agomerge from open-source master
The Android Open Source Project [Mon, 19 Jul 2010 22:18:45 +0000 (15:18 -0700)]
merge from open-source master

Change-Id: I0a74758673231384186e810f7371900a09b73800

14 years agoRemove unused variable and associated import
Ben Clark [Sat, 17 Jul 2010 18:35:56 +0000 (19:35 +0100)]
Remove unused variable and associated import

Change-Id: I5d83cf68c1604b252e860c6b3258654fcae7a589

14 years agoam be38a39f: merge from open-source master
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.

14 years agomerge from open-source master
The Android Open Source Project [Mon, 19 Jul 2010 19:52:09 +0000 (12:52 -0700)]
merge from open-source master

Change-Id: Ibdfd887cae67bb6eba26e0f4e02765ad5b07e657

14 years agoFix window leak problems in settings.
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

14 years agoam 40686ee8: am 15fe0e47: Merge "Allow soft AP settings config before bring up" into...
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