OSDN Git Service

android-x86/packages-apps-Settings.git
14 years agoam 44c2220f: am 51a81002: Merge change 27057 into eclair
Jaikumar Ganesh [Fri, 25 Sep 2009 18:26:30 +0000 (11:26 -0700)]
am 44c2220f: am 51a81002: Merge change 27057 into eclair

Merge commit '44c2220f2e2c8217a4cf05e7074ee4e7fb95ec11'

* commit '44c2220f2e2c8217a4cf05e7074ee4e7fb95ec11':
  Restrict Bluetooth adapater name length to 200 characters.

14 years agoam 60d2ae23: am 0f8e20f1: Merge change 26713 into eclair
Suchi Amalapurapu [Fri, 25 Sep 2009 18:26:08 +0000 (11:26 -0700)]
am 60d2ae23: am 0f8e20f1: Merge change 26713 into eclair

Merge commit '60d2ae2334806d5b1ee3a0a3113b8396103c117a'

* commit '60d2ae2334806d5b1ee3a0a3113b8396103c117a':
  Set selection in single choice list.

14 years agoam 520c7356: am 776dcff1: Merge change 26878 into eclair
Michael Chan [Fri, 25 Sep 2009 18:26:05 +0000 (11:26 -0700)]
am 520c7356: am 776dcff1: Merge change 26878 into eclair

Merge commit '520c7356cf86b681fc670fce49e2749c9fb2bff0'

* commit '520c7356cf86b681fc670fce49e2749c9fb2bff0':
  b/2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)

14 years agoam 7a6341b0: am f73cdd4d: New icon for Privacy. Also, forgot to remove Factory reset...
Amith Yamasani [Fri, 25 Sep 2009 18:16:06 +0000 (11:16 -0700)]
am 7a6341b0: am f73cdd4d: New icon for Privacy. Also, forgot to remove Factory reset from About phone.

Merge commit '7a6341b07667e50e6236c481b972e31e9562544f'

* commit '7a6341b07667e50e6236c481b972e31e9562544f':
  New icon for Privacy.

14 years agoam 05c05254: am f2f3ceeb: b/2138890 Pre-initilize Bluetooth profile managers
Michael Chan [Fri, 25 Sep 2009 18:07:51 +0000 (11:07 -0700)]
am 05c05254: am f2f3ceeb: b/2138890 Pre-initilize Bluetooth profile managers

Merge commit '05c052541455dea7f00d2bde412bc6bb1686ac72'

* commit '05c052541455dea7f00d2bde412bc6bb1686ac72':
  b/2138890 Pre-initilize Bluetooth profile managers

14 years agoam 0fad576c: am ec54997a: Fix issue #2133206: dialogs/menus should auto-dismiss when...
Dianne Hackborn [Fri, 25 Sep 2009 18:01:05 +0000 (11:01 -0700)]
am 0fad576c: am ec54997a: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off

Merge commit '0fad576cb56669ff070d4cdd571ea220cf43dea4'

* commit '0fad576cb56669ff070d4cdd571ea220cf43dea4':
  Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off

14 years agoam ef83ad69: am e65c943f: New Privacy settings screen and Backup settings toggle...
Amith Yamasani [Fri, 25 Sep 2009 17:53:45 +0000 (10:53 -0700)]
am ef83ad69: am e65c943f: New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178

Merge commit 'ef83ad69c79069de13202173351183af46036bfd'

* commit 'ef83ad69c79069de13202173351183af46036bfd':
  New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178

14 years agoam e7f230a3: am 0ce6f6db: Search and rewrite some uses of select and disable for...
Roy West [Fri, 25 Sep 2009 17:53:07 +0000 (10:53 -0700)]
am e7f230a3: am 0ce6f6db: Search and rewrite some uses of select and disable for touch and use.

Merge commit 'e7f230a36332f5cdc1454e9ce44195c01a49806f'

* commit 'e7f230a36332f5cdc1454e9ce44195c01a49806f':
  Search and rewrite some uses of select and disable for touch and use.

14 years agoam 51a81002: Merge change 27057 into eclair
Jaikumar Ganesh [Fri, 25 Sep 2009 17:34:20 +0000 (10:34 -0700)]
am 51a81002: Merge change 27057 into eclair

Merge commit '51a81002ec11b4aa57eadf40ad10aa09248381a0' into eclair-plus-aosp

* commit '51a81002ec11b4aa57eadf40ad10aa09248381a0':
  Restrict Bluetooth adapater name length to 200 characters.

14 years agoMerge change 27057 into eclair
Android (Google) Code Review [Fri, 25 Sep 2009 17:28:10 +0000 (13:28 -0400)]
Merge change 27057 into eclair

* changes:
  Restrict Bluetooth adapater name length to 200 characters.

14 years agoRestrict Bluetooth adapater name length to 200 characters.
Jaikumar Ganesh [Fri, 25 Sep 2009 16:54:35 +0000 (09:54 -0700)]
Restrict Bluetooth adapater name length to 200 characters.

The max allowed as per spec is 248.
Change-Id: I287fb7f861a30e736d6078923712433c52f3031a

14 years agoam 0f8e20f1: Merge change 26713 into eclair
Suchi Amalapurapu [Fri, 25 Sep 2009 17:19:29 +0000 (10:19 -0700)]
am 0f8e20f1: Merge change 26713 into eclair

Merge commit '0f8e20f122b9f7ec323c28c6a3d61fd2ac78b71e' into eclair-plus-aosp

* commit '0f8e20f122b9f7ec323c28c6a3d61fd2ac78b71e':
  Set selection in single choice list.

14 years agoam 776dcff1: Merge change 26878 into eclair
Michael Chan [Fri, 25 Sep 2009 17:19:24 +0000 (10:19 -0700)]
am 776dcff1: Merge change 26878 into eclair

Merge commit '776dcff14387140721d46ccd97cf51ce81be7f85' into eclair-plus-aosp

* commit '776dcff14387140721d46ccd97cf51ce81be7f85':
  b/2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)

14 years agoMerge change 26713 into eclair
Android (Google) Code Review [Fri, 25 Sep 2009 17:16:26 +0000 (13:16 -0400)]
Merge change 26713 into eclair

* changes:
  Set selection in single choice list. Reorder the menu entries to use the menu options as indices into the choice box directly

14 years agoMerge change 26878 into eclair
Android (Google) Code Review [Fri, 25 Sep 2009 17:12:40 +0000 (13:12 -0400)]
Merge change 26878 into eclair

* changes:
  b/2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)

14 years agob/2140751 Fixed the problem where BT device icon was showing until pairing happens...
Michael Chan [Thu, 24 Sep 2009 18:39:34 +0000 (11:39 -0700)]
b/2140751 Fixed the problem where BT device icon was showing until pairing happens (actually UUID comes in to be exact)

Change-Id: I670f29d5f9a577ec177b049cfd9c775bf91b60c3

14 years agoam 3c96a621: am 1bfe73d0: Filter devices by UUID and then class.
Jaikumar Ganesh [Fri, 25 Sep 2009 15:51:37 +0000 (08:51 -0700)]
am 3c96a621: am 1bfe73d0: Filter devices by UUID and then class.

Merge commit '3c96a621c0fbe5304dfb73bd5fab3b3c27a3f1dd'

* commit '3c96a621c0fbe5304dfb73bd5fab3b3c27a3f1dd':
  Filter devices by UUID and then class.

14 years agoam f73cdd4d: New icon for Privacy. Also, forgot to remove Factory reset from About...
Amith Yamasani [Fri, 25 Sep 2009 01:59:55 +0000 (18:59 -0700)]
am f73cdd4d: New icon for Privacy. Also, forgot to remove Factory reset from About phone.

Merge commit 'f73cdd4dd09d585cf59c3c91872bc21449491b03' into eclair-plus-aosp

* commit 'f73cdd4dd09d585cf59c3c91872bc21449491b03':
  New icon for Privacy.

14 years agoNew icon for Privacy.
Amith Yamasani [Fri, 25 Sep 2009 01:41:40 +0000 (18:41 -0700)]
New icon for Privacy.
Also, forgot to remove Factory reset from About phone.

14 years agoam f2f3ceeb: b/2138890 Pre-initilize Bluetooth profile managers
Michael Chan [Thu, 24 Sep 2009 18:52:22 +0000 (11:52 -0700)]
am f2f3ceeb: b/2138890 Pre-initilize Bluetooth profile managers

Merge commit 'f2f3ceebbdf724e8904712a2a21cb0e677b7ea0d' into eclair-plus-aosp

* commit 'f2f3ceebbdf724e8904712a2a21cb0e677b7ea0d':
  b/2138890 Pre-initilize Bluetooth profile managers

14 years agob/2138890 Pre-initilize Bluetooth profile managers
Michael Chan [Thu, 24 Sep 2009 14:45:49 +0000 (07:45 -0700)]
b/2138890 Pre-initilize Bluetooth profile managers

Change-Id: I633202457ca445308ec35b99260e603a85451042

14 years agoam ec54997a: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Dianne Hackborn [Thu, 24 Sep 2009 06:27:50 +0000 (23:27 -0700)]
am ec54997a: Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off

Merge commit 'ec54997a04307887b709c607808dace00df2f138' into eclair-plus-aosp

* commit 'ec54997a04307887b709c607808dace00df2f138':
  Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off

14 years agoFix issue #2133206: dialogs/menus should auto-dismiss when screen turns off
Dianne Hackborn [Thu, 24 Sep 2009 05:24:22 +0000 (22:24 -0700)]
Fix issue #2133206: dialogs/menus should auto-dismiss when screen turns off

These dialogs should clear.

Change-Id: Ie78212c1bd112d1f2f7a05f2d23eb9b5c9f02131

14 years agoSet selection in single choice list.
Suchi Amalapurapu [Wed, 23 Sep 2009 23:33:56 +0000 (16:33 -0700)]
Set selection in single choice list.
Reorder the menu entries to use the menu options as indices into
the choice box directly

14 years agoam e65c943f: New Privacy settings screen and Backup settings toggle. See #2132044...
Amith Yamasani [Wed, 23 Sep 2009 22:32:53 +0000 (15:32 -0700)]
am e65c943f: New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178

Merge commit 'e65c943f974966e21c6f18dc9a95107ea1f07631' into eclair-plus-aosp

* commit 'e65c943f974966e21c6f18dc9a95107ea1f07631':
  New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178

14 years agoNew Privacy settings screen and Backup settings toggle. See #2132044 & #2133178
Amith Yamasani [Tue, 22 Sep 2009 20:50:19 +0000 (13:50 -0700)]
New Privacy settings screen and Backup settings toggle. See #2132044 & #2133178

Also fixes 2138367: Share with Google setting doesn't get updated on checking the setting
And 2098232: "Set unlock pattern" should be at the top of the section

14 years agoam 0ce6f6db: Search and rewrite some uses of select and disable for touch and use.
Roy West [Wed, 23 Sep 2009 21:52:24 +0000 (14:52 -0700)]
am 0ce6f6db: Search and rewrite some uses of select and disable for touch and use.

Merge commit '0ce6f6dbc842b4a9fce0c34850b17bf543a12ed0' into eclair-plus-aosp

* commit '0ce6f6dbc842b4a9fce0c34850b17bf543a12ed0':
  Search and rewrite some uses of select and disable for touch and use.

14 years agoSearch and rewrite some uses of select and disable for touch and use.
Roy West [Wed, 23 Sep 2009 20:07:19 +0000 (13:07 -0700)]
Search and rewrite some uses of select and disable for touch and use.

14 years agoam dd5dd7d9: am 90456311: Merge change 26396 into eclair
Michael Chan [Wed, 23 Sep 2009 18:37:24 +0000 (11:37 -0700)]
am dd5dd7d9: am 90456311: Merge change 26396 into eclair

Merge commit 'dd5dd7d93dbf895d50b651027ef68a75f1f14a51'

* commit 'dd5dd7d93dbf895d50b651027ef68a75f1f14a51':
  b/2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.

14 years agoam 1bfe73d0: Filter devices by UUID and then class.
Jaikumar Ganesh [Wed, 23 Sep 2009 17:49:46 +0000 (10:49 -0700)]
am 1bfe73d0: Filter devices by UUID and then class.

Merge commit '1bfe73d0b1d338f3c16a8177eb8de509e44a5c01' into eclair-plus-aosp

* commit '1bfe73d0b1d338f3c16a8177eb8de509e44a5c01':
  Filter devices by UUID and then class.

14 years agoFilter devices by UUID and then class.
Jaikumar Ganesh [Wed, 23 Sep 2009 17:32:41 +0000 (10:32 -0700)]
Filter devices by UUID and then class.

The settings app has been updated to use UUIDs.
When there is a filter type set for device picket UI, use the
UUIDs first and then the class bits.

Change-Id: Ifde5dbc3a1cf25babce4c686002315aa3933de59

14 years agoam 90456311: Merge change 26396 into eclair
Michael Chan [Tue, 22 Sep 2009 22:51:00 +0000 (15:51 -0700)]
am 90456311: Merge change 26396 into eclair

Merge commit '9045631186a4f7fcf49a3f4700276ad8fbcab90c' into eclair-plus-aosp

* commit '9045631186a4f7fcf49a3f4700276ad8fbcab90c':
  b/2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.

14 years agoMerge change 26396 into eclair
Android (Google) Code Review [Tue, 22 Sep 2009 22:38:45 +0000 (18:38 -0400)]
Merge change 26396 into eclair

* changes:
  b/2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.

14 years agob/2126036 Improve remote device capability identification by switching to use UUIDs...
Michael Chan [Mon, 21 Sep 2009 01:18:27 +0000 (18:18 -0700)]
b/2126036 Improve remote device capability identification by switching to use UUIDs instead of class bits.

Change-Id: Ie60d1c579e40027c2174215c1989887a3250c9bc

14 years agoam aa3500db: am 031ba6a3: Merge change 26365 into eclair
Chia-chi Yeh [Tue, 22 Sep 2009 16:13:35 +0000 (09:13 -0700)]
am aa3500db: am 031ba6a3: Merge change 26365 into eclair

Merge commit 'aa3500dba73613252adb6964ef7af14bd2d7f6e3'

* commit 'aa3500dba73613252adb6964ef7af14bd2d7f6e3':
  SecuritySettings: use Credentials instead of CertTool.

14 years agoam 367c7ac8: am 59d1977c: Merge change 26363 into eclair
Chia-chi Yeh [Tue, 22 Sep 2009 16:13:31 +0000 (09:13 -0700)]
am 367c7ac8: am 59d1977c: Merge change 26363 into eclair

Merge commit '367c7ac866063cc1c658457c55f2dde55c6a3785'

* commit '367c7ac866063cc1c658457c55f2dde55c6a3785':
  WifiSettings: use Credentials instead of CertTool.

14 years agoam 3f85d8e8: am cb41032d: Merge change 26186 into eclair
Chia-chi Yeh [Tue, 22 Sep 2009 16:13:27 +0000 (09:13 -0700)]
am 3f85d8e8: am cb41032d: Merge change 26186 into eclair

Merge commit '3f85d8e8ddbfe63f6366dd180cbb63d7b56a5b5b'

* commit '3f85d8e8ddbfe63f6366dd180cbb63d7b56a5b5b':
  Settings: revise VpnSettings.

14 years agoam 031ba6a3: Merge change 26365 into eclair
Chia-chi Yeh [Tue, 22 Sep 2009 16:08:01 +0000 (09:08 -0700)]
am 031ba6a3: Merge change 26365 into eclair

Merge commit '031ba6a3648367d307596f11b94367e50651397b' into eclair-plus-aosp

* commit '031ba6a3648367d307596f11b94367e50651397b':
  SecuritySettings: use Credentials instead of CertTool.

14 years agoam 59d1977c: Merge change 26363 into eclair
Chia-chi Yeh [Tue, 22 Sep 2009 16:07:57 +0000 (09:07 -0700)]
am 59d1977c: Merge change 26363 into eclair

Merge commit '59d1977ccd2ad686c39770aad31cae04a5c8d457' into eclair-plus-aosp

* commit '59d1977ccd2ad686c39770aad31cae04a5c8d457':
  WifiSettings: use Credentials instead of CertTool.

14 years agoam cb41032d: Merge change 26186 into eclair
Chia-chi Yeh [Tue, 22 Sep 2009 16:07:54 +0000 (09:07 -0700)]
am cb41032d: Merge change 26186 into eclair

Merge commit 'cb41032d85e2538c0a0a85f72656891c6203dc9b' into eclair-plus-aosp

* commit 'cb41032d85e2538c0a0a85f72656891c6203dc9b':
  Settings: revise VpnSettings.

14 years agoMerge change 26365 into eclair
Android (Google) Code Review [Tue, 22 Sep 2009 16:03:17 +0000 (12:03 -0400)]
Merge change 26365 into eclair

* changes:
  SecuritySettings: use Credentials instead of CertTool.

14 years agoMerge change 26363 into eclair
Android (Google) Code Review [Tue, 22 Sep 2009 16:02:57 +0000 (12:02 -0400)]
Merge change 26363 into eclair

* changes:
  WifiSettings: use Credentials instead of CertTool.

14 years agoMerge change 26186 into eclair
Android (Google) Code Review [Tue, 22 Sep 2009 16:02:34 +0000 (12:02 -0400)]
Merge change 26186 into eclair

* changes:
  Settings: revise VpnSettings.

14 years agoSecuritySettings: use Credentials instead of CertTool.
Chia-chi Yeh [Tue, 22 Sep 2009 15:59:01 +0000 (23:59 +0800)]
SecuritySettings: use Credentials instead of CertTool.

Also remove unused classes which will be replaced by CertInstaller.

14 years agoWifiSettings: use Credentials instead of CertTool.
Chia-chi Yeh [Tue, 22 Sep 2009 15:44:17 +0000 (23:44 +0800)]
WifiSettings: use Credentials instead of CertTool.

14 years agoam 30f8a387: am 8c212ef4: Remove long animation setting (standard length is now longer).
Dianne Hackborn [Tue, 22 Sep 2009 00:46:45 +0000 (17:46 -0700)]
am 30f8a387: am 8c212ef4: Remove long animation setting (standard length is now longer).

Merge commit '30f8a38786c63796ba9914adfdd45b4134adbbb3'

* commit '30f8a38786c63796ba9914adfdd45b4134adbbb3':
  Remove long animation setting (standard length is now longer).

14 years agoam 6b0d2f2c: am 7d1e0865: Adjust widget size.
Ken Shirriff [Tue, 22 Sep 2009 00:46:41 +0000 (17:46 -0700)]
am 6b0d2f2c: am 7d1e0865: Adjust widget size.

Merge commit '6b0d2f2c09860c012fa1bebcd34feb4350b7dcbb'

* commit '6b0d2f2c09860c012fa1bebcd34feb4350b7dcbb':
  Adjust widget size.

14 years agoam 8c212ef4: Remove long animation setting (standard length is now longer).
Dianne Hackborn [Tue, 22 Sep 2009 00:39:53 +0000 (17:39 -0700)]
am 8c212ef4: Remove long animation setting (standard length is now longer).

Merge commit '8c212ef4cfd911ba80dd256cab7a3f997e2cb8cc' into eclair-plus-aosp

* commit '8c212ef4cfd911ba80dd256cab7a3f997e2cb8cc':
  Remove long animation setting (standard length is now longer).

14 years agoam 7d1e0865: Adjust widget size.
Ken Shirriff [Tue, 22 Sep 2009 00:39:49 +0000 (17:39 -0700)]
am 7d1e0865: Adjust widget size.

Merge commit '7d1e086504c6bd3bdeb52f137fde1380d1288aa1' into eclair-plus-aosp

* commit '7d1e086504c6bd3bdeb52f137fde1380d1288aa1':
  Adjust widget size.

14 years agoRemove long animation setting (standard length is now longer).
Dianne Hackborn [Mon, 21 Sep 2009 07:37:32 +0000 (00:37 -0700)]
Remove long animation setting (standard length is now longer).

Also a few tweaks to the running services UI.

Change-Id: I160dc5fd52a865ca95288aad787e28b814080c53

14 years agoSettings: revise VpnSettings.
Chia-chi Yeh [Mon, 21 Sep 2009 18:28:14 +0000 (02:28 +0800)]
Settings: revise VpnSettings.

14 years agoam 5466090c: am 9e710510: Merge change 26022 into eclair
Suchi Amalapurapu [Mon, 21 Sep 2009 16:36:04 +0000 (09:36 -0700)]
am 5466090c: am 9e710510: Merge change 26022 into eclair

Merge commit '5466090cb8bb8f93423a19902157e6cea8c4fc62'

* commit '5466090cb8bb8f93423a19902157e6cea8c4fc62':
  Change default filter to third party when launched via settings and all apps when launched via

14 years agoAdjust widget size.
Ken Shirriff [Sun, 20 Sep 2009 22:21:28 +0000 (15:21 -0700)]
Adjust widget size.

Without this change, the widget cannot be placed on the home screen in
landscape mode because it's thought to be too big.

14 years agoam 9e710510: Merge change 26022 into eclair
Suchi Amalapurapu [Mon, 21 Sep 2009 16:30:20 +0000 (09:30 -0700)]
am 9e710510: Merge change 26022 into eclair

Merge commit '9e7105108ba0aecc961b2ecc3003a57242c982bc' into eclair-plus-aosp

* commit '9e7105108ba0aecc961b2ecc3003a57242c982bc':
  Change default filter to third party when launched via settings and all apps when launched via

14 years agoMerge change 26022 into eclair
Android (Google) Code Review [Mon, 21 Sep 2009 16:23:14 +0000 (12:23 -0400)]
Merge change 26022 into eclair

* changes:
  Change default filter to third party when launched via settings and all apps when launched via low storage. Update string name. fix padding for Force Stop button Change message when clearing application data.

14 years agoam 451ada66: am e32e8baa: Fix the typo in phase2 options.
Chung-yih Wang [Mon, 21 Sep 2009 10:53:18 +0000 (03:53 -0700)]
am 451ada66: am e32e8baa: Fix the typo in phase2 options.

Merge commit '451ada665d6cc85b0a77643c59a752f7099db812'

* commit '451ada665d6cc85b0a77643c59a752f7099db812':
  Fix the typo in phase2 options.

14 years agoam e32e8baa: Fix the typo in phase2 options.
Chung-yih Wang [Mon, 21 Sep 2009 10:49:13 +0000 (03:49 -0700)]
am e32e8baa: Fix the typo in phase2 options.

Merge commit 'e32e8baa44f10749518cffdc6a9a47130fb3e19d' into eclair-plus-aosp

* commit 'e32e8baa44f10749518cffdc6a9a47130fb3e19d':
  Fix the typo in phase2 options.

14 years agoFix the typo in phase2 options.
Chung-yih Wang [Mon, 21 Sep 2009 10:42:55 +0000 (18:42 +0800)]
Fix the typo in phase2 options.

MSCHAP2 => MSCHAPV2

14 years agoam 35b21807: am d459bebd: Use the ratio of different CPU speeds to compute CPU power...
Amith Yamasani [Mon, 21 Sep 2009 00:08:08 +0000 (17:08 -0700)]
am 35b21807: am d459bebd: Use the ratio of different CPU speeds to compute CPU power consumption per app.

Merge commit '35b21807e81fada6df6d1ab898ed189ec1994d4e'

* commit '35b21807e81fada6df6d1ab898ed189ec1994d4e':
  Use the ratio of different CPU speeds to compute CPU power consumption per app.

14 years agoam d459bebd: Use the ratio of different CPU speeds to compute CPU power consumption...
Amith Yamasani [Mon, 21 Sep 2009 00:03:52 +0000 (17:03 -0700)]
am d459bebd: Use the ratio of different CPU speeds to compute CPU power consumption per app.

Merge commit 'd459bebd89756a8b735feb6f27bd864b0427feb7' into eclair-plus-aosp

* commit 'd459bebd89756a8b735feb6f27bd864b0427feb7':
  Use the ratio of different CPU speeds to compute CPU power consumption per app.

14 years agoUse the ratio of different CPU speeds to compute CPU power consumption per app.
Amith Yamasani [Sun, 20 Sep 2009 22:52:35 +0000 (15:52 -0700)]
Use the ratio of different CPU speeds to compute CPU power consumption per app.

14 years agoChange default filter to third party when launched via settings and all apps when...
Suchi Amalapurapu [Sun, 20 Sep 2009 21:25:46 +0000 (14:25 -0700)]
Change default filter to third party when launched via settings and all apps when launched via
low storage. Update string name.
fix padding for Force Stop button
Change message when clearing application data.

14 years agoam 06a20451: am 8cd8b0b7: Merge change 25969 into eclair
Ken Shirriff [Sun, 20 Sep 2009 20:32:56 +0000 (13:32 -0700)]
am 06a20451: am 8cd8b0b7: Merge change 25969 into eclair

Merge commit '06a20451d88f93fc03367231a8cb97bc793194bf'

* commit '06a20451d88f93fc03367231a8cb97bc793194bf':
  Fix power widget dimensions.

14 years agoam 8cd8b0b7: Merge change 25969 into eclair
Ken Shirriff [Sun, 20 Sep 2009 20:25:03 +0000 (13:25 -0700)]
am 8cd8b0b7: Merge change 25969 into eclair

Merge commit '8cd8b0b7edca98b84c5a1f6223ac0b343eb26e8d' into eclair-plus-aosp

* commit '8cd8b0b7edca98b84c5a1f6223ac0b343eb26e8d':
  Fix power widget dimensions.

14 years agoMerge change 25969 into eclair
Android (Google) Code Review [Sun, 20 Sep 2009 20:17:52 +0000 (16:17 -0400)]
Merge change 25969 into eclair

* changes:
  Fix power widget dimensions.

14 years agoFix power widget dimensions.
Ken Shirriff [Sun, 20 Sep 2009 18:04:05 +0000 (11:04 -0700)]
Fix power widget dimensions.

The widget was taking 2 units vertically on some devices.

14 years agoam 6c1ac291: am dc543d28: Fix the issue WiFi UI IP settings lost when change slider...
Benny Wong [Fri, 18 Sep 2009 17:12:09 +0000 (10:12 -0700)]
am 6c1ac291: am dc543d28: Fix the issue WiFi UI IP settings lost when change slider state before save IP settings

Merge commit '6c1ac291d9f8adacc5dd3b8b5f08a11dced53ecb'

* commit '6c1ac291d9f8adacc5dd3b8b5f08a11dced53ecb':
  Fix the issue WiFi UI IP settings lost when change slider state before save IP settings

14 years agoam dc543d28: Fix the issue WiFi UI IP settings lost when change slider state before...
Benny Wong [Fri, 18 Sep 2009 17:07:00 +0000 (10:07 -0700)]
am dc543d28: Fix the issue WiFi UI IP settings lost when change slider state before save IP settings

Merge commit 'dc543d289884386faa1361d8fca5536a59c72c1a' into eclair-plus-aosp

* commit 'dc543d289884386faa1361d8fca5536a59c72c1a':
  Fix the issue WiFi UI IP settings lost when change slider state before save IP settings

14 years agoFix the issue WiFi UI IP settings lost when change slider state before save IP settings
Benny Wong [Thu, 17 Sep 2009 05:41:21 +0000 (00:41 -0500)]
Fix the issue WiFi UI IP settings lost when change slider state before save IP settings

Original GID: 1062

14 years agoam 9341f5d8: am f66beeae: Follow along with startActivityPendingIntent() change.
Dianne Hackborn [Fri, 18 Sep 2009 01:13:10 +0000 (18:13 -0700)]
am 9341f5d8: am f66beeae: Follow along with startActivityPendingIntent() change.

Merge commit '9341f5d81cffd972281e25b414ecaeb716ab16a8'

* commit '9341f5d81cffd972281e25b414ecaeb716ab16a8':
  Follow along with startActivityPendingIntent() change.

14 years agoam f66beeae: Follow along with startActivityPendingIntent() change.
Dianne Hackborn [Fri, 18 Sep 2009 01:08:35 +0000 (18:08 -0700)]
am f66beeae: Follow along with startActivityPendingIntent() change.

Merge commit 'f66beeaea7d3654bee280644f4edc6d7215b0ee5' into eclair-plus-aosp

* commit 'f66beeaea7d3654bee280644f4edc6d7215b0ee5':
  Follow along with startActivityPendingIntent() change.

14 years agoFollow along with startActivityPendingIntent() change.
Dianne Hackborn [Thu, 17 Sep 2009 22:15:46 +0000 (15:15 -0700)]
Follow along with startActivityPendingIntent() change.

Change-Id: I6d804af66deeaf87339eeb548b6a3d2965262f02

14 years agoam 8b2397f7: (-s ours) am 909a9450: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 22:26:40 +0000 (15:26 -0700)]
am 8b2397f7: (-s ours) am 909a9450: Import revised translations.  DO NOT MERGE

Merge commit '8b2397f734fe0e541eb1629e24b9447e6d482df9'

* commit '8b2397f734fe0e541eb1629e24b9447e6d482df9':
  Import revised translations.  DO NOT MERGE

14 years agoam 909a9450: Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 22:15:27 +0000 (15:15 -0700)]
am 909a9450: Import revised translations.  DO NOT MERGE

Merge commit '909a945031ec5ec372991de1d2ea1718f494ab9c' into eclair-plus-aosp

* commit '909a945031ec5ec372991de1d2ea1718f494ab9c':
  Import revised translations.  DO NOT MERGE

14 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 17 Sep 2009 21:35:43 +0000 (14:35 -0700)]
Import revised translations.  DO NOT MERGE

14 years agoam 87f0c26b: am 3faa23a2: Use new memory API; show memory used by bg and fg processes.
Dianne Hackborn [Thu, 17 Sep 2009 19:27:09 +0000 (12:27 -0700)]
am 87f0c26b: am 3faa23a2: Use new memory API; show memory used by bg and fg processes.

Merge commit '87f0c26b31f14860f4db564362087d7bc91f27cb'

* commit '87f0c26b31f14860f4db564362087d7bc91f27cb':
  Use new memory API; show memory used by bg and fg processes.

14 years agoam 3faa23a2: Use new memory API; show memory used by bg and fg processes.
Dianne Hackborn [Thu, 17 Sep 2009 19:20:04 +0000 (12:20 -0700)]
am 3faa23a2: Use new memory API; show memory used by bg and fg processes.

Merge commit '3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1' into eclair-plus-aosp

* commit '3faa23a2b0dcd0a19acf7b24e7eea36d67b4eda1':
  Use new memory API; show memory used by bg and fg processes.

14 years agoam 88da45e5: am 985f5efc: Add "settings" to a bunch of screens. Fix 2110077, 2115734...
Amith Yamasani [Thu, 17 Sep 2009 19:17:56 +0000 (12:17 -0700)]
am 88da45e5: am 985f5efc: Add "settings" to a bunch of screens. Fix 211007721157342101651

Merge commit '88da45e51ba137a7e83992efc9b63babad42d57c'

* commit '88da45e51ba137a7e83992efc9b63babad42d57c':
  Add "settings" to a bunch of screens. Fix 211007721157342101651

14 years agoam 04f3b821: am 5d9ee149: Merge change 25397 into eclair
Suchi Amalapurapu [Thu, 17 Sep 2009 19:09:38 +0000 (12:09 -0700)]
am 04f3b821: am 5d9ee149: Merge change 25397 into eclair

Merge commit '04f3b82137ae952f0e0653b9fdd1cf8d8d08afd7'

* commit '04f3b82137ae952f0e0653b9fdd1cf8d8d08afd7':
  Fix issues with updating list when applications get installed while ManageApps is paused or stopped.

14 years agoam f48fb571: am 9da119df: Merge change 25387 into eclair
Romain Guy [Thu, 17 Sep 2009 19:09:34 +0000 (12:09 -0700)]
am f48fb571: am 9da119df: Merge change 25387 into eclair

Merge commit 'f48fb571e96696b26c1a0b2badb62bd38fe57a2d'

* commit 'f48fb571e96696b26c1a0b2badb62bd38fe57a2d':
  Fix broken 9patch for hdpi.

14 years agoam e60a8ebd: am bb334392: Merge change 25354 into eclair
Jaikumar Ganesh [Thu, 17 Sep 2009 19:09:30 +0000 (12:09 -0700)]
am e60a8ebd: am bb334392: Merge change 25354 into eclair

Merge commit 'e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1'

* commit 'e60a8ebd0e2a1911c0c5ac5f5b1d3e8f1c212cb1':
  Fix string name for bluetooth pairing and fix NPE

14 years agoam 5bfc786e: am ae57dbd6: make power settings widget toggle sync, not background...
Debajit Ghosh [Thu, 17 Sep 2009 19:09:26 +0000 (12:09 -0700)]
am 5bfc786e: am ae57dbd6: make power settings widget toggle sync, not background data

Merge commit '5bfc786ebe258a349aba57aedbb38717ae696c13'

* commit '5bfc786ebe258a349aba57aedbb38717ae696c13':
  make power settings widget toggle sync, not background data

14 years agoUse new memory API; show memory used by bg and fg processes.
Dianne Hackborn [Thu, 17 Sep 2009 17:24:34 +0000 (10:24 -0700)]
Use new memory API; show memory used by bg and fg processes.

Change-Id: I449eba1aa4bc1de7537f8c526e27d32c1979d823

14 years agoam 985f5efc: Add "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
Amith Yamasani [Thu, 17 Sep 2009 17:46:44 +0000 (10:46 -0700)]
am 985f5efc: Add "settings" to a bunch of screens. Fix 211007721157342101651

Merge commit '985f5efc8278e1a5c2170c3aba354a4c9367b741' into eclair-plus-aosp

* commit '985f5efc8278e1a5c2170c3aba354a4c9367b741':
  Add "settings" to a bunch of screens. Fix 211007721157342101651

14 years agoAdd "settings" to a bunch of screens. Fix 2110077, 2115734, 2101651
Amith Yamasani [Wed, 16 Sep 2009 19:43:50 +0000 (12:43 -0700)]
Add "settings" to a bunch of screens. Fix 211007721157342101651

Move Factory data reset to About phone.

Show input method when dialog to enter/edit new dictionary word is displayed.

Add title to Accessibility settings.

14 years agoam 9752a844: am dd1bb33e: Merge change 24646 into eclair
Chung-yih Wang [Thu, 17 Sep 2009 16:52:42 +0000 (09:52 -0700)]
am 9752a844: am dd1bb33e: Merge change 24646 into eclair

Merge commit '9752a84445f224c28514c19645e8d640068d9df9'

* commit '9752a84445f224c28514c19645e8d640068d9df9':
  Aggregate the security settings for WiFi network configuration.

14 years agoam c26442e9: am 65f49474: Restore backlight brightness after restoring auto ALS mode.
Mike Lockwood [Thu, 17 Sep 2009 16:52:38 +0000 (09:52 -0700)]
am c26442e9: am 65f49474: Restore backlight brightness after restoring auto ALS mode.

Merge commit 'c26442e923d9deb5bea3fa78da661b1eb24bd965'

* commit 'c26442e923d9deb5bea3fa78da661b1eb24bd965':
  Restore backlight brightness after restoring auto ALS mode.

14 years agoam e74b1c6a: am 10d3cf50: Enable cert install from sdcard in Settings...
Hung-ying Tyan [Thu, 17 Sep 2009 16:52:33 +0000 (09:52 -0700)]
am e74b1c6a: am 10d3cf50: Enable cert install from sdcard in Settings...

Merge commit 'e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf'

* commit 'e74b1c6ae4c21d81ad7343e8ac53c259b2b869cf':
  Enable cert install from sdcard in Settings...

14 years agoam 7b22c686: am dd498f90: Merge change 24870 into eclair
Chung-yih Wang [Thu, 17 Sep 2009 16:52:10 +0000 (09:52 -0700)]
am 7b22c686: am dd498f90: Merge change 24870 into eclair

Merge commit '7b22c686854263194e37250117c62457f9ba6e89'

* commit '7b22c686854263194e37250117c62457f9ba6e89':
  Transient patch for the WifiConfiguration change.

14 years agoam 5d9ee149: Merge change 25397 into eclair
Suchi Amalapurapu [Thu, 17 Sep 2009 15:46:20 +0000 (08:46 -0700)]
am 5d9ee149: Merge change 25397 into eclair

Merge commit '5d9ee1490258d56e0e1074b5e9b9a4bff39dd602' into eclair-plus-aosp

* commit '5d9ee1490258d56e0e1074b5e9b9a4bff39dd602':
  Fix issues with updating list when applications get installed while ManageApps is paused or stopped.

14 years agoam 9da119df: Merge change 25387 into eclair
Romain Guy [Thu, 17 Sep 2009 15:42:22 +0000 (08:42 -0700)]
am 9da119df: Merge change 25387 into eclair

Merge commit '9da119dff89ca8433e253dd1df19eaceba8e9641' into eclair-plus-aosp

* commit '9da119dff89ca8433e253dd1df19eaceba8e9641':
  Fix broken 9patch for hdpi.

14 years agoam bb334392: Merge change 25354 into eclair
Jaikumar Ganesh [Thu, 17 Sep 2009 15:41:11 +0000 (08:41 -0700)]
am bb334392: Merge change 25354 into eclair

Merge commit 'bb3343923c640461eecc4fac25f911224a16d056' into eclair-plus-aosp

* commit 'bb3343923c640461eecc4fac25f911224a16d056':
  Fix string name for bluetooth pairing and fix NPE

14 years agoam ae57dbd6: make power settings widget toggle sync, not background data
Debajit Ghosh [Thu, 17 Sep 2009 15:40:17 +0000 (08:40 -0700)]
am ae57dbd6: make power settings widget toggle sync, not background data

Merge commit 'ae57dbd618decb8cdc942756e283fadef659b2b6' into eclair-plus-aosp

* commit 'ae57dbd618decb8cdc942756e283fadef659b2b6':
  make power settings widget toggle sync, not background data

14 years agoam 7b354367: am a383452a: Merge change 25125 into eclair
Jaikumar Ganesh [Thu, 17 Sep 2009 13:41:40 +0000 (06:41 -0700)]
am 7b354367: am a383452a: Merge change 25125 into eclair

Merge commit '7b354367af8407dd6ee89fe4875047b1134eda9a'

* commit '7b354367af8407dd6ee89fe4875047b1134eda9a':
  Show name for incoming pairing requests.

14 years agoam 5e10e111: am cd03f532: Move backlight brightness from HardwareService to PowerManager
Mike Lockwood [Thu, 17 Sep 2009 13:39:09 +0000 (06:39 -0700)]
am 5e10e111: am cd03f532: Move backlight brightness from HardwareService to PowerManager

Merge commit '5e10e11116087d27c14d1a07d36dc7959af6a97f'

* commit '5e10e11116087d27c14d1a07d36dc7959af6a97f':
  Move backlight brightness from HardwareService to PowerManager

14 years agoam 661df9b6: am a096888f: apps/settings: Add auto/manual brightness control to Bright...
Dan Murphy [Thu, 17 Sep 2009 06:57:34 +0000 (23:57 -0700)]
am 661df9b6: am a096888f: apps/settings: Add auto/manual brightness control to Brightness settings

Merge commit '661df9b62ae5a5b0ba0671fd1d38230e6f9c3d7e'

* commit '661df9b62ae5a5b0ba0671fd1d38230e6f9c3d7e':
  apps/settings: Add auto/manual brightness control to Brightness settings

14 years agoam 7c20380e: am a3aaf19e: Fix setting passwd string and vpn checkbox titles.
Hung-ying Tyan [Thu, 17 Sep 2009 06:54:02 +0000 (23:54 -0700)]
am 7c20380e: am a3aaf19e: Fix setting passwd string and vpn checkbox titles.

Merge commit '7c20380ee1602f03e25583136825304c51fcb794'

* commit '7c20380ee1602f03e25583136825304c51fcb794':
  Fix setting passwd string and vpn checkbox titles.

14 years agoam 1b7ffcf4: (-s ours) am 5f23cb39: Modify settings for 2.1
Jaikumar Ganesh [Thu, 17 Sep 2009 06:53:54 +0000 (23:53 -0700)]
am 1b7ffcf4: (-s ours) am 5f23cb39: Modify settings for 2.1

Merge commit '1b7ffcf4957191cbd805a4863ece75cd549575e9'

* commit '1b7ffcf4957191cbd805a4863ece75cd549575e9':
  Modify settings for 2.1

14 years agoMerge change 25397 into eclair
Android (Google) Code Review [Thu, 17 Sep 2009 05:05:12 +0000 (01:05 -0400)]
Merge change 25397 into eclair

* changes:
  Fix issues with updating list when applications get installed while ManageApps is paused or stopped. When ManageApps gets started, the list of installed apps is retrieved from PackageManager and compared against the old list to figure out newly installed apps(since the app has been stopped) and also to weedout stale entries of packages which might have been deleted. Since the application objects themselves might have changed the list is usually refreshed with new objects. Deleted applications are taken care of right away by just removing from the List adapter. For newly added apps however, the size and label/resource info has to be loaded before being inserted in to the list since the list is already sorted. So just remove these entries from the list for now and let ADD_PKG message handle adding the new elements. Make AppInfo a nested class so that it doesn't hold a reference to its enclosing class and  we have too many such entries one for each package.

14 years agoFix issues with updating list when applications get installed while ManageApps is...
Suchi Amalapurapu [Wed, 16 Sep 2009 23:38:10 +0000 (16:38 -0700)]
Fix issues with updating list when applications get installed while ManageApps is paused or stopped.
When ManageApps gets started, the list of installed apps is retrieved from PackageManager and
compared against the old list to figure out newly installed apps(since the app has been stopped) and
also to weedout stale entries of packages which might have been deleted.
Since the application objects themselves might have changed the list is usually refreshed with new objects.
Deleted applications are taken care of right away by just removing from the List adapter.
For newly added apps however, the size and label/resource info has to be loaded before being inserted in to
the list since the list is already sorted. So just remove these entries from the list for now and let
ADD_PKG message handle adding the new elements.
Make AppInfo a nested class so that it doesn't hold a reference to its enclosing class and
 we have too many such entries one for each package.