OSDN Git Service

android-x86/packages-apps-Settings.git
14 years agoam 75f25db9: am d7705d4c: Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work
Amith Yamasani [Thu, 1 Oct 2009 18:16:58 +0000 (11:16 -0700)]
am 75f25db9: am d7705d4c: Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work

Merge commit '75f25db90dd5465273cd23f27d2f5a1cd625aeb9'

* commit '75f25db90dd5465273cd23f27d2f5a1cd625aeb9':
  Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work

14 years agoam 31794fa9: am 69c51fea: New icons
Mike Cleron [Thu, 1 Oct 2009 18:12:20 +0000 (11:12 -0700)]
am 31794fa9: am 69c51fea: New icons

Merge commit '31794fa97992a7a17a108ac99247ae2c904b8509'

* commit '31794fa97992a7a17a108ac99247ae2c904b8509':
  New icons

14 years agoam d7705d4c: Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work
Amith Yamasani [Tue, 29 Sep 2009 18:20:59 +0000 (11:20 -0700)]
am d7705d4c: Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work

Merge commit 'd7705d4cd710ad93954acbffa464f9c96bf33809' into eclair-plus-aosp

* commit 'd7705d4cd710ad93954acbffa464f9c96bf33809':
  Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work

14 years agoam 26917f1d: am e1089ad3: b/2142065 Added Bluetooth API to allow developer to request...
Michael Chan [Tue, 29 Sep 2009 18:13:37 +0000 (11:13 -0700)]
am 26917f1d: am e1089ad3: b/2142065 Added Bluetooth API to allow developer to request the user\'s permission to enable discovery mode.

Merge commit '26917f1ddd052534c4a6e1577b79570d9bbbdd10'

* commit '26917f1ddd052534c4a6e1577b79570d9bbbdd10':
  b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.

14 years agoFix 2147749: Make Settings.ACTION_SOUND_SETTINGS work
Amith Yamasani [Tue, 29 Sep 2009 18:10:05 +0000 (11:10 -0700)]
Fix 2147749: Make Settings.ACTION_SOUND_SETTINGS work

Added the official action to the Settings manifest.

14 years agoam dcd813ea: am c63742c8: Merge change I87d7f224 into eclair
Roy West [Tue, 29 Sep 2009 18:08:05 +0000 (11:08 -0700)]
am dcd813ea: am c63742c8: Merge change I87d7f224 into eclair

Merge commit 'dcd813eac8678afaedc35f0271d79f1617cd810d'

* commit 'dcd813eac8678afaedc35f0271d79f1617cd810d':
  Correct "on-screen" to "onscreen"; fix tts screen title

14 years agoam 19f8e36b: am 079ee952: Update application for android.bluetooth.ParcelUuid ->...
Nick Pelly [Tue, 29 Sep 2009 18:07:19 +0000 (11:07 -0700)]
am 19f8e36b: am 079ee952: Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid

Merge commit '19f8e36b5a3d70d87c8ec2429f090ec12b54d87b'

* commit '19f8e36b5a3d70d87c8ec2429f090ec12b54d87b':
  Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid

14 years agoam 5d6278dd: am 7b576e49: Merge change 27058 into eclair
Lixin Yue [Tue, 29 Sep 2009 18:07:16 +0000 (11:07 -0700)]
am 5d6278dd: am 7b576e49: Merge change 27058 into eclair

Merge commit '5d6278dd11f2cfcf84fcb21772bab9ec9abbaaad'

* commit '5d6278dd11f2cfcf84fcb21772bab9ec9abbaaad':
  Fix device picker minor bug

14 years agoam b20be6e2: am 5a201b78: Merge change 27473 into eclair
Suchi Amalapurapu [Tue, 29 Sep 2009 18:07:12 +0000 (11:07 -0700)]
am b20be6e2: am 5a201b78: Merge change 27473 into eclair

Merge commit 'b20be6e24a7b546e413a00c51f8079fa7233651b'

* commit 'b20be6e24a7b546e413a00c51f8079fa7233651b':
  Rename empty view so that the standard list view implementation

14 years agoam 69c51fea: New icons
Mike Cleron [Tue, 29 Sep 2009 07:51:39 +0000 (00:51 -0700)]
am 69c51fea: New icons

Merge commit '69c51fea86c1c29b801c2c369ba1a0ce68dfbaf6' into eclair-plus-aosp

* commit '69c51fea86c1c29b801c2c369ba1a0ce68dfbaf6':
  New icons

14 years agoNew icons
Mike Cleron [Tue, 29 Sep 2009 07:30:34 +0000 (00:30 -0700)]
New icons

14 years agoam e1089ad3: b/2142065 Added Bluetooth API to allow developer to request the user...
Michael Chan [Tue, 29 Sep 2009 00:39:14 +0000 (17:39 -0700)]
am e1089ad3: b/2142065 Added Bluetooth API to allow developer to request the user\'s permission to enable discovery mode.

Merge commit 'e1089ad33896f4fe5b75e773813367d700773b6f' into eclair-plus-aosp

* commit 'e1089ad33896f4fe5b75e773813367d700773b6f':
  b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.

14 years agob/2142065 Added Bluetooth API to allow developer to request the user's permission...
Michael Chan [Sat, 26 Sep 2009 13:16:17 +0000 (06:16 -0700)]
b/2142065 Added Bluetooth API to allow developer to request the user's permission to enable discovery mode.

Change-Id: I6da1598661ad05b4cfd2b7cc81e05d3053df5777

14 years agoam c63742c8: Merge change I87d7f224 into eclair
Roy West [Mon, 28 Sep 2009 20:44:51 +0000 (13:44 -0700)]
am c63742c8: Merge change I87d7f224 into eclair

Merge commit 'c63742c8fa533b6fc879f12ccecc2a51c1aca23b' into eclair-plus-aosp

* commit 'c63742c8fa533b6fc879f12ccecc2a51c1aca23b':
  Correct "on-screen" to "onscreen"; fix tts screen title

14 years agoMerge change I87d7f224 into eclair
Android (Google) Code Review [Mon, 28 Sep 2009 20:37:00 +0000 (16:37 -0400)]
Merge change I87d7f224 into eclair

* changes:
  Correct "on-screen" to "onscreen"; fix tts screen title

14 years agoam 079ee952: Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Nick Pelly [Mon, 28 Sep 2009 20:19:08 +0000 (13:19 -0700)]
am 079ee952: Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid

Merge commit '079ee952bdfae560c36df1f1dcd3f1177e4afa47' into eclair-plus-aosp

* commit '079ee952bdfae560c36df1f1dcd3f1177e4afa47':
  Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid

14 years agoam 7b576e49: Merge change 27058 into eclair
Lixin Yue [Mon, 28 Sep 2009 20:19:05 +0000 (13:19 -0700)]
am 7b576e49: Merge change 27058 into eclair

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

* commit '7b576e491718e9a6d3f0f66421eddbdfaa853d87':
  Fix device picker minor bug

14 years agoam 5a201b78: Merge change 27473 into eclair
Suchi Amalapurapu [Mon, 28 Sep 2009 20:19:01 +0000 (13:19 -0700)]
am 5a201b78: Merge change 27473 into eclair

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

* commit '5a201b787233a7e2b9b4bf6f84ab14b2cd3eec74':
  Rename empty view so that the standard list view implementation

14 years agoUpdate application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid
Nick Pelly [Mon, 28 Sep 2009 19:28:14 +0000 (12:28 -0700)]
Update application for android.bluetooth.ParcelUuid -> android.os.ParcelUuid

Change-Id: Iebf2b3ea9cac224e3e6c67e503b1063491dce5bb

14 years agoMerge change 27058 into eclair
Android (Google) Code Review [Mon, 28 Sep 2009 18:46:49 +0000 (14:46 -0400)]
Merge change 27058 into eclair

* changes:
  Fix device picker minor bug

14 years agoMerge change 27473 into eclair
Android (Google) Code Review [Mon, 28 Sep 2009 18:46:24 +0000 (14:46 -0400)]
Merge change 27473 into eclair

* changes:
  Rename empty view so that the standard list view implementation displays empty list message when list goes empty. Ideally the list is not empty for running processes and All filter options. so the message is just set to third party apps Remove the empty list view logic from code base

14 years agoam ea7f30ff: am 5928da68: Merge change 27471 into eclair
Ken Shirriff [Mon, 28 Sep 2009 18:42:15 +0000 (11:42 -0700)]
am ea7f30ff: am 5928da68: Merge change 27471 into eclair

Merge commit 'ea7f30ffc426e0b251384778b64271261ca82b4c'

* commit 'ea7f30ffc426e0b251384778b64271261ca82b4c':
  Fix power widget brightness for Sholes.

14 years agoam 5928da68: Merge change 27471 into eclair
Ken Shirriff [Mon, 28 Sep 2009 18:34:10 +0000 (11:34 -0700)]
am 5928da68: Merge change 27471 into eclair

Merge commit '5928da682a31f3375a206d551c478d76437bb7cf' into eclair-plus-aosp

* commit '5928da682a31f3375a206d551c478d76437bb7cf':
  Fix power widget brightness for Sholes.

14 years agoRename empty view so that the standard list view implementation
Suchi Amalapurapu [Mon, 28 Sep 2009 18:27:48 +0000 (11:27 -0700)]
Rename empty view so that the standard list view implementation
displays empty list message when list goes empty. Ideally the list is
not empty for running processes and All filter options. so the
message is just set to third party apps
Remove the empty list view logic from code base

14 years agoMerge change 27471 into eclair
Android (Google) Code Review [Mon, 28 Sep 2009 18:27:15 +0000 (14:27 -0400)]
Merge change 27471 into eclair

* changes:
  Fix power widget brightness for Sholes.

14 years agoFix power widget brightness for Sholes.
Ken Shirriff [Mon, 28 Sep 2009 18:17:20 +0000 (11:17 -0700)]
Fix power widget brightness for Sholes.

The widget must disable automatic brightness before modifying the brightness.

14 years agoam 57b49b70: am afa9d6ea: Merge change 27283 into eclair
jsh [Mon, 28 Sep 2009 17:31:14 +0000 (10:31 -0700)]
am 57b49b70: am afa9d6ea: Merge change 27283 into eclair

Merge commit '57b49b70de0ec6ea7528b44c0b82594c804996b7'

* commit '57b49b70de0ec6ea7528b44c0b82594c804996b7':
  Display cell location for CDMA in Phone info screen.

14 years agoam afa9d6ea: Merge change 27283 into eclair
jsh [Mon, 28 Sep 2009 17:26:12 +0000 (10:26 -0700)]
am afa9d6ea: Merge change 27283 into eclair

Merge commit 'afa9d6ea321228add087f753e1e2a3853150d56f' into eclair-plus-aosp

* commit 'afa9d6ea321228add087f753e1e2a3853150d56f':
  Display cell location for CDMA in Phone info screen.

14 years agoMerge change 27283 into eclair
Android (Google) Code Review [Mon, 28 Sep 2009 17:21:44 +0000 (13:21 -0400)]
Merge change 27283 into eclair

* changes:
  Display cell location for CDMA in Phone info screen.

14 years agoam ad088b68: am 70cef693: Add CredentialInstaller.
Hung-ying Tyan [Mon, 28 Sep 2009 17:06:01 +0000 (10:06 -0700)]
am ad088b68: am 70cef693: Add CredentialInstaller.

Merge commit 'ad088b68b646bfc5195f04b1d7e96a68f8995c54'

* commit 'ad088b68b646bfc5195f04b1d7e96a68f8995c54':
  Add CredentialInstaller.

14 years agoCorrect "on-screen" to "onscreen"; fix tts screen title
Roy West [Sun, 27 Sep 2009 19:01:46 +0000 (12:01 -0700)]
Correct "on-screen" to "onscreen"; fix tts screen title

14 years agoam b62f48c6: am a38a1a77: Merge change 27285 into eclair
Michael Chan [Mon, 28 Sep 2009 08:12:41 +0000 (01:12 -0700)]
am b62f48c6: am a38a1a77: Merge change 27285 into eclair

Merge commit 'b62f48c6d32f74d8683bc300332afd5635af143a'

* commit 'b62f48c6d32f74d8683bc300332afd5635af143a':
  b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.

14 years agoam bfcb8900: am a40fb237: Add Safety information to Settings > About Phone
Wink Saville [Mon, 28 Sep 2009 08:11:42 +0000 (01:11 -0700)]
am bfcb8900: am a40fb237: Add Safety information to Settings > About Phone

Merge commit 'bfcb8900804cc9e7e18ef60805d994dcf53a45c7'

* commit 'bfcb8900804cc9e7e18ef60805d994dcf53a45c7':
  Add Safety information to Settings > About Phone

14 years agoam 70cef693: Add CredentialInstaller.
Hung-ying Tyan [Mon, 28 Sep 2009 08:09:34 +0000 (01:09 -0700)]
am 70cef693: Add CredentialInstaller.

Merge commit '70cef693d133bc66db029bf055c51733ac54c972' into eclair-plus-aosp

* commit '70cef693d133bc66db029bf055c51733ac54c972':
  Add CredentialInstaller.

14 years agoam d13e95cc: am 9281c929: Explicitly show plugged state.
Dianne Hackborn [Mon, 28 Sep 2009 08:08:12 +0000 (01:08 -0700)]
am d13e95cc: am 9281c929: Explicitly show plugged state.

Merge commit 'd13e95cc2605c3ffe9d961d2e2c269c9179b5007'

* commit 'd13e95cc2605c3ffe9d961d2e2c269c9179b5007':
  Explicitly show plugged state.

14 years agoAdd CredentialInstaller.
Hung-ying Tyan [Mon, 28 Sep 2009 02:14:18 +0000 (10:14 +0800)]
Add CredentialInstaller.

14 years agoam fd5e1e94: am 782d1ae0: Merge change 27181 into eclair
johnwang [Sun, 27 Sep 2009 22:43:24 +0000 (15:43 -0700)]
am fd5e1e94: am 782d1ae0: Merge change 27181 into eclair

Merge commit 'fd5e1e9453d51b227e8f2fb6852098f94e5a7eed'

* commit 'fd5e1e9453d51b227e8f2fb6852098f94e5a7eed':
  Update neighboring cell printout.

14 years agoam e14c56cd: am 7ac8e67e: Merge change 26706 into eclair
johnwang [Sun, 27 Sep 2009 22:41:14 +0000 (15:41 -0700)]
am e14c56cd: am 7ac8e67e: Merge change 26706 into eclair

Merge commit 'e14c56cd99aa033cffcc36dc14de67401acb21f5'

* commit 'e14c56cd99aa033cffcc36dc14de67401acb21f5':
  Format cleanup.

14 years agoam 72233c9d: am 22e18689: packages/apps/Setting: Make vkey button haptics part of...
Dan Murphy [Sun, 27 Sep 2009 22:38:32 +0000 (15:38 -0700)]
am 72233c9d: am 22e18689: packages/apps/Setting: Make vkey button haptics part of global haptic setting

Merge commit '72233c9d02f27a21d03f8560cc50132168cf6464'

* commit '72233c9d02f27a21d03f8560cc50132168cf6464':
  packages/apps/Setting: Make vkey button haptics part of global haptic setting

14 years agoam a38a1a77: Merge change 27285 into eclair
Michael Chan [Sun, 27 Sep 2009 20:01:13 +0000 (13:01 -0700)]
am a38a1a77: Merge change 27285 into eclair

Merge commit 'a38a1a77ab36e6779790401c3a02604e428ac58b' into eclair-plus-aosp

* commit 'a38a1a77ab36e6779790401c3a02604e428ac58b':
  b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.

14 years agoMerge change 27285 into eclair
Android (Google) Code Review [Sun, 27 Sep 2009 19:53:43 +0000 (15:53 -0400)]
Merge change 27285 into eclair

* changes:
  b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.

14 years agob/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned...
Michael Chan [Sun, 27 Sep 2009 19:46:51 +0000 (12:46 -0700)]
b/2137747 Fixed the problem where BT is stuck grayed out if you turned off BT, turned on Airplane mode, turn off then on screen, turned off Airplane mode.

Change-Id: I37c628e4a98157ed91d519518773a458dca36c00

14 years agoDisplay cell location for CDMA in Phone info screen.
jsh [Thu, 24 Sep 2009 16:19:22 +0000 (09:19 -0700)]
Display cell location for CDMA in Phone info screen.

Useful for debugging location issues.
b/2134743

14 years agoam a40fb237: Add Safety information to Settings > About Phone
Wink Saville [Sun, 27 Sep 2009 19:00:01 +0000 (12:00 -0700)]
am a40fb237: Add Safety information to Settings > About Phone

Merge commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3' into eclair-plus-aosp

* commit 'a40fb23734cc5d5ac6e69a060cbb488269ad8af3':
  Add Safety information to Settings > About Phone

14 years agoAdd Safety information to Settings > About Phone
Wink Saville [Sat, 26 Sep 2009 23:47:18 +0000 (16:47 -0700)]
Add Safety information to Settings > About Phone

The Safety information link is stored in a system property, ro.url.safetylegal

If the phone has data connection, select "Safety information" menu will open the
Safety information link.  If there is no data connection for the phone, a message will
pop up which ask user to open Safety information link from PC.

Change-Id: Ia46e2e868ebcda93138cb9f00c978d8ac827022a

14 years agoam 9281c929: Explicitly show plugged state.
Dianne Hackborn [Sat, 26 Sep 2009 20:02:59 +0000 (13:02 -0700)]
am 9281c929: Explicitly show plugged state.

Merge commit '9281c929d6e4abf0ddf77d614b2eb57f7528397a' into eclair-plus-aosp

* commit '9281c929d6e4abf0ddf77d614b2eb57f7528397a':
  Explicitly show plugged state.

14 years agoExplicitly show plugged state.
Dianne Hackborn [Sat, 26 Sep 2009 19:44:02 +0000 (12:44 -0700)]
Explicitly show plugged state.

Change-Id: I4592382cdcc9e116d3af102fd76057968a6ea874

14 years agoam 782d1ae0: Merge change 27181 into eclair
johnwang [Sat, 26 Sep 2009 01:07:51 +0000 (18:07 -0700)]
am 782d1ae0: Merge change 27181 into eclair

Merge commit '782d1ae019a81f6c46908f2d056246a344759567' into eclair-plus-aosp

* commit '782d1ae019a81f6c46908f2d056246a344759567':
  Update neighboring cell printout.

14 years agoMerge change 27181 into eclair
Android (Google) Code Review [Sat, 26 Sep 2009 01:01:34 +0000 (21:01 -0400)]
Merge change 27181 into eclair

* changes:
  Update neighboring cell printout.

14 years agoUpdate neighboring cell printout.
johnwang [Sat, 26 Sep 2009 00:26:54 +0000 (17:26 -0700)]
Update neighboring cell printout.

14 years agoam 7ac8e67e: Merge change 26706 into eclair
johnwang [Fri, 25 Sep 2009 23:11:35 +0000 (16:11 -0700)]
am 7ac8e67e: Merge change 26706 into eclair

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

* commit '7ac8e67e58f1433c61414cdd79281097c04ead86':
  Format cleanup.

14 years agoMerge change 26706 into eclair
Android (Google) Code Review [Fri, 25 Sep 2009 23:06:18 +0000 (19:06 -0400)]
Merge change 26706 into eclair

* changes:
  Format cleanup.

14 years agoam 22e18689: packages/apps/Setting: Make vkey button haptics part of global haptic...
Dan Murphy [Fri, 25 Sep 2009 21:18:56 +0000 (14:18 -0700)]
am 22e18689: packages/apps/Setting: Make vkey button haptics part of global haptic setting

Merge commit '22e186898e47cf35a49e73494bf11695c854d284' into eclair-plus-aosp

* commit '22e186898e47cf35a49e73494bf11695c854d284':
  packages/apps/Setting: Make vkey button haptics part of global haptic setting

14 years agoFormat cleanup.
johnwang [Wed, 23 Sep 2009 23:22:34 +0000 (16:22 -0700)]
Format cleanup.

Remove tailing white space.

14 years agopackages/apps/Setting: Make vkey button haptics part of global haptic setting
Dan Murphy [Tue, 22 Sep 2009 16:47:08 +0000 (11:47 -0500)]
packages/apps/Setting: Make vkey button haptics part of global haptic setting

This change ties the virtual key haptics to the global haptics settings

Signed-off-by: Dan Murphy <D.Murphy@motorola.com>
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 agoFix device picker minor bug
Lixin Yue [Tue, 22 Sep 2009 02:44:51 +0000 (10:44 +0800)]
Fix device picker minor bug

When in device picker screen, if other device triggers pairing process with own
device, after paired succssfully, it should not send intent to OppReceiver to
start file sending. We need check if the paired device is the one user selected.

Original Author: Lixin Yue
Modified by: Jaikumar Ganesh (jaikumar@google.com)

Change-Id: I32df995ba94417470cccaead492844a9c61c0846

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.