git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Amith Yamasani [Mon, 24 Jan 2011 21:32:31 +0000 (13:32 -0800)]

am 1219b482: am 7b8dff50: Merge "Bring back the MDN (phone number) status even if there\'s no voice." into honeycomb

* commit '1219b482e05042226cbe452957a6f024b9cd1723':
Bring back the MDN (phone number) status even if there's no voice.

commit | commitdiff | tree

Justin Ho [Mon, 24 Jan 2011 21:32:24 +0000 (13:32 -0800)]

am 3792e92d: am 4aee9f88: Merge "Updated Bluetooth assets to fix sizing problems" into honeycomb

* commit '3792e92d68b3d34e5a9aa92b98ea85a98bf93b3c':
Updated Bluetooth assets to fix sizing problems

commit | commitdiff | tree

Justin Ho [Mon, 24 Jan 2011 21:32:21 +0000 (13:32 -0800)]

am cd3115b8: am 146249ad: Updating Bluetooth preference page to use different configuration icon

* commit 'cd3115b880f8e14792abf9d75c45414cc3facc32':
Updating Bluetooth preference page to use different configuration icon

commit | commitdiff | tree

Amith Yamasani [Mon, 24 Jan 2011 20:10:25 +0000 (12:10 -0800)]

am 7b8dff50: Merge "Bring back the MDN (phone number) status even if there\'s no voice." into honeycomb

* commit '7b8dff506fa319ab809ee3b6506b79642f9867cd':
Bring back the MDN (phone number) status even if there's no voice.

commit | commitdiff | tree

Justin Ho [Mon, 24 Jan 2011 20:10:23 +0000 (12:10 -0800)]

am 4aee9f88: Merge "Updated Bluetooth assets to fix sizing problems" into honeycomb

* commit '4aee9f889498a7883e60f0cfe05faad403e95569':
Updated Bluetooth assets to fix sizing problems

commit | commitdiff | tree

Justin Ho [Mon, 24 Jan 2011 20:10:19 +0000 (12:10 -0800)]

am 146249ad: Updating Bluetooth preference page to use different configuration icon

* commit '146249ad9382d8d243a287bf3c65f49b286d9fb7':
Updating Bluetooth preference page to use different configuration icon

commit | commitdiff | tree

Amith Yamasani [Mon, 24 Jan 2011 20:07:52 +0000 (12:07 -0800)]

Merge "Bring back the MDN (phone number) status even if there's no voice." into honeycomb

commit | commitdiff | tree

Amith Yamasani [Mon, 24 Jan 2011 16:56:07 +0000 (08:56 -0800)]

Bring back the MDN (phone number) status even if there's no voice.

Needed for carrier customer support purposes.

Bug: 3351493

Change "My phone number" string to "MDN".

Change-Id: Icee0f97348034a9fb7f79a3c48868d5f74edabb1

commit | commitdiff | tree

Justin Ho [Mon, 24 Jan 2011 17:47:21 +0000 (09:47 -0800)]

Merge "Updated Bluetooth assets to fix sizing problems" into honeycomb

commit | commitdiff | tree

Justin Ho [Mon, 24 Jan 2011 17:41:57 +0000 (09:41 -0800)]

Updating Bluetooth preference page to use different configuration icon

Change-Id: Ie5bf105e5522fb2a876c51c9407f02f2a3974631

commit | commitdiff | tree

Jim Miller [Mon, 24 Jan 2011 07:44:16 +0000 (23:44 -0800)]

am a634d843: am 22c060eb: Merge "Fix 3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb

* commit 'a634d843b5fc82febc13230ea0506f7423581a62':
Fix 3315488: Wrap OwnerInfo layout in a ScrollView

commit | commitdiff | tree

Jim Miller [Mon, 24 Jan 2011 07:36:31 +0000 (23:36 -0800)]

am 22c060eb: Merge "Fix 3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb

* commit '22c060ebd14bd92c67bd97f53d67bb06f0a215de':
Fix 3315488: Wrap OwnerInfo layout in a ScrollView

commit | commitdiff | tree

Jim Miller [Mon, 24 Jan 2011 02:25:21 +0000 (18:25 -0800)]

Merge "Fix 3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb

commit | commitdiff | tree

Jim Miller [Mon, 24 Jan 2011 02:14:13 +0000 (18:14 -0800)]

Fix 3315488: Wrap OwnerInfo layout in a ScrollView

Change-Id: I5fc5a66c1a09ff4e45137469fee1b6de6b45c7a0

commit | commitdiff | tree

Adam Powell [Mon, 24 Jan 2011 01:54:21 +0000 (17:54 -0800)]

am cb671560: am a31be80e: Fix bug 3381583 - Settings action bar not refreshing menu content

* commit 'cb671560ef3ac30b205fe339766e6ec464daefab':
Fix bug 3381583 - Settings action bar not refreshing menu content

commit | commitdiff | tree

Adam Powell [Mon, 24 Jan 2011 01:52:23 +0000 (17:52 -0800)]

am a31be80e: Fix bug 3381583 - Settings action bar not refreshing menu content

* commit 'a31be80ef056add00e0d239414f80f932978277f':
Fix bug 3381583 - Settings action bar not refreshing menu content

commit | commitdiff | tree

Adam Powell [Mon, 24 Jan 2011 01:35:41 +0000 (17:35 -0800)]

Fix bug 3381583 - Settings action bar not refreshing menu content

Change-Id: I71416dbf691a6dacfb58c6ac3cc0df8233db8f44

commit | commitdiff | tree

Andy Stadler [Mon, 24 Jan 2011 00:59:56 +0000 (16:59 -0800)]

am d06ff87d: am 6370c87a: Maintain password quality while encrypted

* commit 'd06ff87d5e29b811f64c39e99b829f4fb3fe0aa8':
Maintain password quality while encrypted

commit | commitdiff | tree

Justin Ho [Mon, 24 Jan 2011 00:44:54 +0000 (16:44 -0800)]

Updated Bluetooth assets to fix sizing problems

Change-Id: Ib9cbd0945c89e511b98c1153b55a22daf9c94fd7

commit | commitdiff | tree

Andy Stadler [Sun, 23 Jan 2011 22:48:53 +0000 (14:48 -0800)]

am 6370c87a: Maintain password quality while encrypted

* commit '6370c87a6b98abfc6badb31070a60f84b3f528b3':
Maintain password quality while encrypted

commit | commitdiff | tree

Andy Stadler [Sat, 22 Jan 2011 00:25:22 +0000 (16:25 -0800)]

Maintain password quality while encrypted

Bug: 3378277
Change-Id: I68aae06c518eb514c1be38214d8c9918b0398f95

commit | commitdiff | tree

Justin Ho [Fri, 21 Jan 2011 23:33:17 +0000 (15:33 -0800)]

am 371e7ac2: am ac94d685: Merge "New Settings assets" into honeycomb

* commit '371e7ac26d6ac9128af35689ac1f1e20643ad024':
New Settings assets

commit | commitdiff | tree

Justin Ho [Fri, 21 Jan 2011 22:55:47 +0000 (14:55 -0800)]

am ac94d685: Merge "New Settings assets" into honeycomb

* commit 'ac94d6852850889ca58480d1af91bc91541f2fce':
New Settings assets

commit | commitdiff | tree

Justin Ho [Fri, 21 Jan 2011 22:52:57 +0000 (14:52 -0800)]

Merge "New Settings assets" into honeycomb

commit | commitdiff | tree

Justin Ho [Fri, 21 Jan 2011 22:25:22 +0000 (14:25 -0800)]

New Settings assets

Change-Id: I1d3309d4e5f9ebb95c2907440ffae69bf8167ce3

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 22:23:16 +0000 (14:23 -0800)]

am 15972229: am f5f4c687: Merge "Accquire a wakelock while encrypting." into honeycomb

* commit '159722294722b602251055ca18e59255ea5e076d':
Accquire a wakelock while encrypting.

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 22:20:41 +0000 (14:20 -0800)]

am f5f4c687: Merge "Accquire a wakelock while encrypting." into honeycomb

* commit 'f5f4c687870ff09ef2fe02677a810af22b57ff99':
Accquire a wakelock while encrypting.

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 22:18:52 +0000 (14:18 -0800)]

Merge "Accquire a wakelock while encrypting." into honeycomb

commit | commitdiff | tree

Andy Stadler [Fri, 21 Jan 2011 22:07:24 +0000 (14:07 -0800)]

am 504ef070: am 3da38a07: Add start-encryption intent filter to settings

* commit '504ef070067ec4aaeea78b5e73aea6f536307323':
Add start-encryption intent filter to settings

commit | commitdiff | tree

Andy Stadler [Fri, 21 Jan 2011 22:05:17 +0000 (14:05 -0800)]

am 3da38a07: Add start-encryption intent filter to settings

* commit '3da38a0771022615ecb568861e489761fe53a05a':
Add start-encryption intent filter to settings

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 21:48:20 +0000 (15:48 -0600)]

Accquire a wakelock while encrypting.

Bug: 3375491
Change-Id: Ief7dbb450800104f4977ab31f93a1e1a994b25ad

commit | commitdiff | tree

Andy Stadler [Fri, 21 Jan 2011 21:38:45 +0000 (13:38 -0800)]

Add start-encryption intent filter to settings

* Add intent-filter for "android.app.action.START_ENCRYPTION"
* Add pseudo-activity to host intent-filter
* Add code to settings page that exits quickly when encryption
is not available or is already started.

This can be tested using ApiDemos -> App -> Device Admin

Bug: 3346770
Change-Id: Ie97459cf9e2a7b09b690bf085e64ef905466e77a

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 20:39:42 +0000 (12:39 -0800)]

am 0113aa35: am 666800a2: Remove unused code.

* commit '0113aa354a188b93f652d9d56bb24a649936c92b':
Remove unused code.

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 20:39:40 +0000 (12:39 -0800)]

am f8ee2f04: am 39f1e040: More UI tweaks and fixes.

* commit 'f8ee2f040751cde0f41468f3b7b22dac9e843f7b':
More UI tweaks and fixes.

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 20:39:38 +0000 (12:39 -0800)]

am a4e011ea: am dbf4322a: Change how we check to see if we should display the progress bar.

* commit 'a4e011ea037c971546dbf00b83661ef4e882c1f5':
Change how we check to see if we should display the progress bar.

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 20:36:12 +0000 (12:36 -0800)]

am 666800a2: Remove unused code.

* commit '666800a237066457c5703fc7c746a5d477249d59':
Remove unused code.

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 20:36:10 +0000 (12:36 -0800)]

am 39f1e040: More UI tweaks and fixes.

* commit '39f1e04079976d3d10fdd8e5dd36c833bab8a371':
More UI tweaks and fixes.

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 20:36:08 +0000 (12:36 -0800)]

am dbf4322a: Change how we check to see if we should display the progress bar.

* commit 'dbf4322ab1cf39d123334a7778c7ccc8942ada74':
Change how we check to see if we should display the progress bar.

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 00:48:55 +0000 (18:48 -0600)]

Remove unused code.

Change-Id: If9fd0f0229721ec1cdce583e6d3180d691213f23

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 05:29:28 +0000 (23:29 -0600)]

More UI tweaks and fixes.

* Actually post the correct message every 5 second for the progress bar.
* Update the text for the settings to a more finalish version.
* Check the battery status before allowing encryption to proceed.
* Display a place holder message if no password is set for the device.

Change-Id: I2734300c9a81467dbd0401427d8b656922ab4819

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 00:49:58 +0000 (18:49 -0600)]

Change how we check to see if we should display the progress bar.

Change-Id: I779e229f82a11d570e832f3e8cc5b275939249e8

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 21 Jan 2011 19:02:07 +0000 (11:02 -0800)]

am e9c7421e: am 5dc460e4: Use correct wording for SteupWizard

* commit 'e9c7421e7fdc01eef324d4393621178a523c82bb':
Use correct wording for SteupWizard

am af7b6cab: am f2d812a5: Merge "Disable the checkbox even if there is a hard keyboard" into honeycomb

* commit 'af7b6cab5ae91ad5fdd8985fda34c622d3118e6d':
Disable the checkbox even if there is a hard keyboard

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 21 Jan 2011 18:46:32 +0000 (10:46 -0800)]

am 30424e7f: am ca2870f3: Rename title for Date Time setup

* commit '30424e7f425e7f1238980c550afa7451858ac107':
Rename title for Date Time setup

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 21 Jan 2011 17:04:27 +0000 (09:04 -0800)]

am 5dc460e4: Use correct wording for SteupWizard

* commit '5dc460e407b782fc8f2cbc5167bfe40eff50a74c':
Use correct wording for SteupWizard

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 21 Jan 2011 07:35:46 +0000 (23:35 -0800)]

Use correct wording for SteupWizard

Bug: 3375688
Change-Id: Id8cdfc5347092277429c0a791fb45d55a7236230

am f2d812a5: Merge "Disable the checkbox even if there is a hard keyboard" into honeycomb

* commit 'f2d812a5d49af75ff796377a23048900f9eef11f':
Disable the checkbox even if there is a hard keyboard

Merge "Disable the checkbox even if there is a hard keyboard" into honeycomb

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 01:24:51 +0000 (17:24 -0800)]

am 739c9a1e: am 43775c7f: Merge "More work on the CryptKeeper." into honeycomb

* commit '739c9a1e7b0028534d2cb1bdb1a0df3255cccbb1':
More work on the CryptKeeper.

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 01:24:49 +0000 (17:24 -0800)]

am f947ca51: am a13e9c87: Merge "Encrypt inplace settings." into honeycomb

* commit 'f947ca515771269b78726fc7609a8e791d5d562a':
Encrypt inplace settings.

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 21 Jan 2011 01:24:48 +0000 (17:24 -0800)]

am 596c5e1a: am 39281d01: Merge "Use new backgrounds in wifi setup for xl" into honeycomb

* commit '596c5e1adccdc081a6982d1833cd2e93c8fe7ecd':
Use new backgrounds in wifi setup for xl

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 21 Jan 2011 01:24:44 +0000 (17:24 -0800)]

am 698e4c8d: am 392a06ed: Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb

* commit '698e4c8dd023f4d4962b3caea2279886dd7f87de':
Let WifiPickerActivity show AdvancedSettings correctly.

commit | commitdiff | tree

Amith Yamasani [Fri, 21 Jan 2011 01:24:41 +0000 (17:24 -0800)]

am fc0968ac: am 7099436c: Merge "Add back the refresh button and fix refresh when restarted." into honeycomb

* commit 'fc0968aca64aca57a87a65dec210f0ab5eb3fc73':
Add back the refresh button and fix refresh when restarted.

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 21 Jan 2011 01:14:09 +0000 (17:14 -0800)]

am ca2870f3: Rename title for Date Time setup

* commit 'ca2870f3734a086a8d9a1551af6ecbe8d4828b1f':
Rename title for Date Time setup

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 01:07:43 +0000 (17:07 -0800)]

am 43775c7f: Merge "More work on the CryptKeeper." into honeycomb

* commit '43775c7f9b8a5bc707c678743d8fc0139a426717':
More work on the CryptKeeper.

commit | commitdiff | tree

Jason parks [Fri, 21 Jan 2011 01:07:36 +0000 (17:07 -0800)]

am a13e9c87: Merge "Encrypt inplace settings." into honeycomb

* commit 'a13e9c877ce4928df0095f47b6117cc4b5403fb2':
Encrypt inplace settings.

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 21 Jan 2011 01:07:03 +0000 (17:07 -0800)]

am 39281d01: Merge "Use new backgrounds in wifi setup for xl" into honeycomb

* commit '39281d0163aa410391a128d1d2c8194c88e732fb':
Use new backgrounds in wifi setup for xl

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 21 Jan 2011 01:04:16 +0000 (17:04 -0800)]

am 392a06ed: Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb

* commit '392a06ed1ee529105a46db2efcf08c3b037af9d8':
Let WifiPickerActivity show AdvancedSettings correctly.

commit | commitdiff | tree

Amith Yamasani [Fri, 21 Jan 2011 01:02:07 +0000 (17:02 -0800)]

am 7099436c: Merge "Add back the refresh button and fix refresh when restarted." into honeycomb

* commit '7099436ca6e963adae9fe978b39700441446f45d':
Add back the refresh button and fix refresh when restarted.

commit | commitdiff | tree

Daisuke Miyakawa [Fri, 21 Jan 2011 00:02:07 +0000 (16:02 -0800)]

Rename title for Date Time setup

Bug: 3374552
Change-Id: I37a4ac3f7fb1a9f0cf9624aba2a69dd85e9743ac

commit | commitdiff | tree

Jason parks [Thu, 20 Jan 2011 23:58:02 +0000 (15:58 -0800)]

Merge "More work on the CryptKeeper." into honeycomb

commit | commitdiff | tree

Jason parks [Thu, 20 Jan 2011 23:50:55 +0000 (15:50 -0800)]

Merge "Encrypt inplace settings." into honeycomb

commit | commitdiff | tree

Daisuke Miyakawa [Thu, 20 Jan 2011 22:59:39 +0000 (14:59 -0800)]

Merge "Use new backgrounds in wifi setup for xl" into honeycomb

commit | commitdiff | tree

Daisuke Miyakawa [Thu, 20 Jan 2011 20:39:27 +0000 (12:39 -0800)]

Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb

commit | commitdiff | tree

Daisuke Miyakawa [Thu, 20 Jan 2011 20:29:29 +0000 (12:29 -0800)]

Let WifiPickerActivity show AdvancedSettings correctly.

- stop overwriting EXTRA_SHOW_FRAGMENT
- Show back/next button when WifiPickerActivity is requested
to show them.

Bug: 3362641
Change-Id: Ic06af4796acb1edb659fb99eb8c7d76c430c7798

commit | commitdiff | tree

Daisuke Miyakawa [Thu, 20 Jan 2011 20:28:47 +0000 (12:28 -0800)]

Use new backgrounds in wifi setup for xl

Bug: 3373467
Change-Id: Iccc9a4c36dc46a67e395c81a642646b8199be606

commit | commitdiff | tree

Amith Yamasani [Thu, 20 Jan 2011 20:08:41 +0000 (12:08 -0800)]

Merge "Add back the refresh button and fix refresh when restarted." into honeycomb

commit | commitdiff | tree

Amith Yamasani [Thu, 20 Jan 2011 19:25:43 +0000 (11:25 -0800)]

Add back the refresh button and fix refresh when restarted.

Bug: 3364738

Fixes the case where after an orientation change, the battery stats
does not refresh.

Also added back the refresh menu button that was on the phone.

Change-Id: I06c69d17c9945ae976e4e7dc135e2e96242fe721

commit | commitdiff | tree

Roy West [Thu, 20 Jan 2011 18:12:29 +0000 (10:12 -0800)]

am 02cfbe9d: am e97bc56d: Tidy up Internal storage screen text.

* commit '02cfbe9db561ada9e594359a8568b30ee5b7f00c':
Tidy up Internal storage screen text.

commit | commitdiff | tree

Roy West [Thu, 20 Jan 2011 18:10:17 +0000 (10:10 -0800)]

am e97bc56d: Tidy up Internal storage screen text.

* commit 'e97bc56db1b84b997467726ca9ecf78193eb03d4':
Tidy up Internal storage screen text.

commit | commitdiff | tree

Roy West [Thu, 20 Jan 2011 18:06:33 +0000 (10:06 -0800)]

Tidy up Internal storage screen text.

Change-Id: Ia1b3b79a6df1756c2a4ff9440463771cfa308c13

Disable the checkbox even if there is a hard keyboard

Change-Id: I9ef8ce273fd72327089ada1133d923715645a141

commit | commitdiff | tree

Ken Wakasa [Thu, 20 Jan 2011 16:16:02 +0000 (08:16 -0800)]

am 93a5d80b: am 5a813ba7: Refine InputMethodInfo API

* commit '93a5d80bd992852257d622cbb7635d5041306ac0':
Refine InputMethodInfo API

commit | commitdiff | tree

Ken Wakasa [Thu, 20 Jan 2011 16:14:15 +0000 (08:14 -0800)]

am 5a813ba7: Refine InputMethodInfo API

* commit '5a813ba7f99f1c797ead4a58fdf05f91296158a4':
Refine InputMethodInfo API

commit | commitdiff | tree

Tadashi G. Takaoka [Thu, 20 Jan 2011 15:47:33 +0000 (07:47 -0800)]

am fdcb2f49: am 9f732013: Use android.provider.Settings.EXTRA_INPUT_METHOD_ID

* commit 'fdcb2f49cf1df3434634b11bb1c094d77c481d1e':
Use android.provider.Settings.EXTRA_INPUT_METHOD_ID

commit | commitdiff | tree

Ken Wakasa [Thu, 20 Jan 2011 13:29:34 +0000 (22:29 +0900)]

Refine InputMethodInfo API

bug: 3370297
Change-Id: Ifaaad399586ee5b842f9b7762281d76e7969d24c

commit | commitdiff | tree

Tadashi G. Takaoka [Thu, 20 Jan 2011 15:40:05 +0000 (07:40 -0800)]

am 9f732013: Use android.provider.Settings.EXTRA_INPUT_METHOD_ID

* commit '9f7320132b7a5e7def378ae754c8c708759a8670':
Use android.provider.Settings.EXTRA_INPUT_METHOD_ID

commit | commitdiff | tree

Tadashi G. Takaoka [Thu, 20 Jan 2011 14:54:21 +0000 (23:54 +0900)]

Use android.provider.Settings.EXTRA_INPUT_METHOD_ID

This change also fixes the action name of
android.settings.INPUT_METHOD_SUBTYPE_SETTINGS.

Change-Id: Ie08e7f9144f8ff8faa8e7d8edf63fbd59421b18c

commit | commitdiff | tree

Tadashi G. Takaoka [Thu, 20 Jan 2011 13:21:14 +0000 (05:21 -0800)]

am a587afe4: am 4c0100f4: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb

* commit 'a587afe44d2a558b3685bfbf4f157c69e19feb26':
Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS

commit | commitdiff | tree

Tadashi G. Takaoka [Thu, 20 Jan 2011 13:19:30 +0000 (05:19 -0800)]

am 4c0100f4: Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb

* commit '4c0100f48f3e83bc960137e3248d7523fa3d5190':
Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS

commit | commitdiff | tree

Tadashi G. Takaoka [Thu, 20 Jan 2011 13:18:01 +0000 (05:18 -0800)]

Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb

commit | commitdiff | tree

Chia-chi Yeh [Thu, 20 Jan 2011 12:30:12 +0000 (04:30 -0800)]

am 2dbfa510: am 9003862e: Merge "Extract credential storage dialogs to a new activity." into honeycomb

* commit '2dbfa510691637c1f773fa0550de50d84bc0e7f0':
Extract credential storage dialogs to a new activity.

commit | commitdiff | tree

Chia-chi Yeh [Thu, 20 Jan 2011 12:28:16 +0000 (04:28 -0800)]

am 9003862e: Merge "Extract credential storage dialogs to a new activity." into honeycomb

* commit '9003862e2548d513bf6d10ee853761ce9a3586d9':
Extract credential storage dialogs to a new activity.

commit | commitdiff | tree

Chia-chi Yeh [Thu, 20 Jan 2011 12:26:10 +0000 (04:26 -0800)]

Merge "Extract credential storage dialogs to a new activity." into honeycomb

commit | commitdiff | tree

Chia-chi Yeh [Thu, 20 Jan 2011 10:46:01 +0000 (18:46 +0800)]

Extract credential storage dialogs to a new activity.

Since now SecuritySettings is a fragment, not an activity, reacting
to intents is not easier anymore. The new activity is transparent,
and it works just like a dialog. This change also refactor'ed
SecuritySettings by moving some preference construction into
security_settings_misc.xml.

Bug: 3120992
Bug: 2117436
Change-Id: I8bd3fc7faa2a31d100b8d67310f9266260cfc31d

commit | commitdiff | tree

Chung-yih Wang [Thu, 20 Jan 2011 10:42:13 +0000 (02:42 -0800)]

am 279d20b8: am a4491eaf: Fix the vpnsetting NPE crash.

* commit '279d20b8e3814c4a9314bbd84df1f323e4df9c51':
Fix the vpnsetting NPE crash.

commit | commitdiff | tree

Chung-yih Wang [Thu, 20 Jan 2011 10:40:42 +0000 (02:40 -0800)]

am a4491eaf: Fix the vpnsetting NPE crash.

* commit 'a4491eafd45c460b0317e7962e24d47e3c4206fb':
Fix the vpnsetting NPE crash.

commit | commitdiff | tree

Chung-yih Wang [Tue, 18 Jan 2011 16:41:50 +0000 (00:41 +0800)]

Fix the vpnsetting NPE crash.

The bug is triggered by rotating the screen after restoring the
vpn setting which was showing the connect dialog from the recent tasks.

Change-Id: I2562b208fa28f9b6ffa8acba1ab14e0f83b3a0c6

commit | commitdiff | tree

Tadashi G. Takaoka [Thu, 20 Jan 2011 08:58:29 +0000 (17:58 +0900)]

Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS

Change-Id: I2aa16ecfffe3b575132437a9e3a071cd1c747e28

commit | commitdiff | tree

Hung-ying Tyan [Thu, 20 Jan 2011 06:48:39 +0000 (22:48 -0800)]

am b88e702b: am 62cc79ef: Make VpnSettings use new synchronous VpnService API.

* commit 'b88e702b81a04892e82f10b756b2e57236cda380':
Make VpnSettings use new synchronous VpnService API.

commit | commitdiff | tree

Hung-ying Tyan [Thu, 20 Jan 2011 06:45:23 +0000 (22:45 -0800)]

am 62cc79ef: Make VpnSettings use new synchronous VpnService API.

* commit '62cc79ef964affaea5ec59c111c01e89f2e0578e':
Make VpnSettings use new synchronous VpnService API.

commit | commitdiff | tree

Hung-ying Tyan [Wed, 19 Jan 2011 08:49:47 +0000 (16:49 +0800)]

Make VpnSettings use new synchronous VpnService API.

Change-Id: Ib400c968981f9f8642a1452011faaade0d5bde57

commit | commitdiff | tree

Daisuke Miyakawa [Thu, 20 Jan 2011 00:41:54 +0000 (16:41 -0800)]

am ef07e32e: am 9b37821d: Merge "Fix Wifi setup for xl." into honeycomb

* commit 'ef07e32e8cd77e41275353705a407c3dbe161d5c':
Fix Wifi setup for xl.

commit | commitdiff | tree

Daisuke Miyakawa [Thu, 20 Jan 2011 00:39:12 +0000 (16:39 -0800)]

am 9b37821d: Merge "Fix Wifi setup for xl." into honeycomb

* commit '9b37821d67f6db1d3d9a9603592e2f053f257fa7':
Fix Wifi setup for xl.

commit | commitdiff | tree

Daisuke Miyakawa [Thu, 20 Jan 2011 00:36:14 +0000 (16:36 -0800)]

Merge "Fix Wifi setup for xl." into honeycomb

commit | commitdiff | tree

Daisuke Miyakawa [Wed, 19 Jan 2011 18:31:45 +0000 (10:31 -0800)]

Fix Wifi setup for xl.

- Show the title "Add network" correctly
- Handle ProgressBar on "Add network" flow correctly
- Handle possible NPE cases.

Bug: 3361270
Change-Id: Ic0fb808086bfce7b0f88e5703e617a62bc71667a

commit | commitdiff | tree

Eric Fischer [Wed, 19 Jan 2011 23:42:04 +0000 (15:42 -0800)]

am d4147929: am a934c39d: Merge "Distinguish Atlantic Time in Barbados from Atlantic Time in Canada." into honeycomb

* commit 'd4147929cb3f068f96f2a3f6a3054c91063c2dbb':
Distinguish Atlantic Time in Barbados from Atlantic Time in Canada.

commit | commitdiff | tree

Jake Hamby [Wed, 19 Jan 2011 23:40:10 +0000 (15:40 -0800)]

am ade2349e: am a76d5390: Merge "Display correct HID icon for pointing and misc. devices" into honeycomb

* commit 'ade2349e75ac86e203511442b7e9636e11c5eec4':
Display correct HID icon for pointing and misc. devices

commit | commitdiff | tree

Eric Fischer [Wed, 19 Jan 2011 23:40:02 +0000 (15:40 -0800)]

am a934c39d: Merge "Distinguish Atlantic Time in Barbados from Atlantic Time in Canada." into honeycomb

* commit 'a934c39d19c0a906065193fe913a318a68d5cc1e':
Distinguish Atlantic Time in Barbados from Atlantic Time in Canada.

commit | commitdiff | tree

Jake Hamby [Wed, 19 Jan 2011 23:38:03 +0000 (15:38 -0800)]

am a76d5390: Merge "Display correct HID icon for pointing and misc. devices" into honeycomb

* commit 'a76d53909913324b3e39d3c5edfd7e0c41abbbb0':
Display correct HID icon for pointing and misc. devices