OSDN Git Service
Hung-ying Tyan [Wed, 26 Jan 2011 02:02:43 +0000 (18:02 -0800)]
am
3753def3: Merge "Allow OnCancelListener and OnDismissListener in Settings app" into honeycomb
* commit '
3753def39da8a4c63ffa787f2572defbc189d7c5':
Allow OnCancelListener and OnDismissListener in Settings app
Hung-ying Tyan [Wed, 26 Jan 2011 02:00:12 +0000 (18:00 -0800)]
Merge "Allow OnCancelListener and OnDismissListener in Settings app" into honeycomb
Jake Hamby [Tue, 25 Jan 2011 22:41:38 +0000 (14:41 -0800)]
am
51cd0d6d: Remove "Allow incoming file transfers" option from BT settings.
* commit '
51cd0d6d29c8f8f5320968f778b04b448984abc8':
Remove "Allow incoming file transfers" option from BT settings.
Jake Hamby [Tue, 25 Jan 2011 21:50:54 +0000 (13:50 -0800)]
Remove "Allow incoming file transfers" option from BT settings.
The user preference to allow automatic incoming file transfers for
specific devices isn't implemented yet. Remove the preference from
the settings UI.
Bug:
3385941
Change-Id: Ib8fee9a0d99063a8c05d52a960664364e4812ace
Jim Miller [Tue, 25 Jan 2011 20:41:04 +0000 (12:41 -0800)]
am
a34279fb: Fix
3383575: use styled attribs and update layout
* commit '
a34279fb2a109d45e88504ce9bc292d7fc7cf2c2':
Fix
3383575: use styled attribs and update layout
Jim Miller [Tue, 25 Jan 2011 05:25:47 +0000 (21:25 -0800)]
Fix
3383575: use styled attribs and update layout
This updates the layout to make more room for the button
text in SecuritySettings. The code now uses styled attributes
to make it easier to tweak in the future.
Change-Id: I5fbdf2f6ae4c4c1f9614ab97891f9f2fe6cda628
Jason parks [Tue, 25 Jan 2011 17:56:00 +0000 (09:56 -0800)]
am
323fa9c6: Merge "Display the correct encryption settings." into honeycomb
* commit '
323fa9c669da74cf1dde982c982f7ea9c0c1b5a8':
Display the correct encryption settings.
Jason parks [Tue, 25 Jan 2011 17:53:00 +0000 (09:53 -0800)]
Merge "Display the correct encryption settings." into honeycomb
Jason parks [Tue, 25 Jan 2011 15:26:55 +0000 (09:26 -0600)]
Display the correct encryption settings.
* You can no longer try to encrypt the device when it is encrypted.
* Moved the encryption section below the lock screen section. It will be more common to change the lock screen settings.
* If the device doesn't support encryption don't display the encryption section.
Bug:
3384074
Change-Id: I172f5894a3cea57b1b8d03a84f1ecf0ee500c1f3
Jason parks [Tue, 25 Jan 2011 15:28:28 +0000 (07:28 -0800)]
am
af6d7cf2: Merge "More UI tweaks." into honeycomb
* commit '
af6d7cf23ca5ca86c39845711f431e76b877a31e':
More UI tweaks.
Jason parks [Tue, 25 Jan 2011 14:39:06 +0000 (06:39 -0800)]
Merge "More UI tweaks." into honeycomb
Jason parks [Mon, 24 Jan 2011 22:19:28 +0000 (16:19 -0600)]
More UI tweaks.
* Grab a full wakelock while encrypting.
* Fix a bug with failed attempts.
* Add a custom theme to animate the screen to black.
* Fix the keyboard to be displayed properly in landscape and portrait.
Change-Id: Icc2d813ce1780588eb3b16f5204c3c60cae5236f
Hung-ying Tyan [Tue, 25 Jan 2011 08:42:14 +0000 (16:42 +0800)]
Allow OnCancelListener and OnDismissListener in Settings app
for the framework-managed dialogs.
DialogFragment acts as both listeners so the application cannot set both
listeners in the embedded dialog. New hooks are added in SettingsDialogFragment
so that settings apps can do so for the framework-managed dialogs.
Bug:
3386670
Change-Id: I144e7c4ccf7f86c61f6079fa86d830c709335af1
Dianne Hackborn [Tue, 25 Jan 2011 06:12:31 +0000 (22:12 -0800)]
am
0385cf14: Fix issue #
3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
* commit '
0385cf14a1b02fafc3d1a094ccfee45de4e9b03a':
Fix issue #
3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
Amith Yamasani [Tue, 25 Jan 2011 06:12:22 +0000 (22:12 -0800)]
am
48e031c7: Merge "Tabletize Device administrator screen and fix the layout for DeviceAdminAdd." into honeycomb
* commit '
48e031c710acb812361d9689836b69b3ee5b5ac2':
Tabletize Device administrator screen and fix the layout for DeviceAdminAdd.
Dianne Hackborn [Tue, 25 Jan 2011 00:22:13 +0000 (16:22 -0800)]
Fix issue #
3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
It looks like the dialog fragment was not being removed along with
the containing fragment. The containing fragment now checks for
when it is being removed and removes its dialog fragment at that
point.
Also fix issue #
3340766 NPE at
com.android.settings.applications.RunningProcessesView.startServiceDetailsActivity
We need to check if the running processes view is still attached to its
owner, since we clear owner when it is paused.
In addition, fix a bug where ManageApplications was not persisting
its "show background processes" state, and remove the icons from
its menu items to make them more understandable in the action bar.
Change-Id: I4498ef92023eb60f90758ff18d8eed7b41af79b0
Amith Yamasani [Tue, 25 Jan 2011 04:43:05 +0000 (20:43 -0800)]
Merge "Tabletize Device administrator screen and fix the layout for DeviceAdminAdd." into honeycomb
Amith Yamasani [Tue, 25 Jan 2011 00:02:11 +0000 (16:02 -0800)]
Tabletize Device administrator screen and fix the layout for DeviceAdminAdd.
Bug:
3376986
Convert the DeviceAdminSettings screen to a fragment, remove fat titlebar.
Convert the DeviceAdminAdd screen to layout nicely in the new holo DialogWhenLarge
style.
Change-Id: I20a9d16aed135a2178969dfff807075b0b79237c
Daisuke Miyakawa [Mon, 24 Jan 2011 22:03:29 +0000 (14:03 -0800)]
am
3f5e524d: Merge "Fix wifi flow" into honeycomb
* commit '
3f5e524d5d69fe23df66a54ea26ff57612a1548c':
Fix wifi flow
Daisuke Miyakawa [Mon, 24 Jan 2011 22:00:07 +0000 (14:00 -0800)]
Merge "Fix wifi flow" into honeycomb
Eric Fischer [Mon, 24 Jan 2011 21:57:26 +0000 (13:57 -0800)]
am
ffc848ef: Merge "Import revised translations. DO NOT MERGE" into honeycomb
* commit '
ffc848eff25106dcc647349e45f901d44fe3b8dd':
Import revised translations. DO NOT MERGE
Amith Yamasani [Mon, 24 Jan 2011 21:57:24 +0000 (13:57 -0800)]
am
26bb586c: Merge "NPE check in VpnSettings." into honeycomb
* commit '
26bb586c9c5af4d369cd6691ed608c7150c04547':
NPE check in VpnSettings.
Eric Fischer [Mon, 24 Jan 2011 21:57:22 +0000 (13:57 -0800)]
am
cfcdcb84: Merge "Restore deleted string still referenced from a layout." into honeycomb
* commit '
cfcdcb84ccbc941ecfb8733c1a848812ba0e0d66':
Restore deleted string still referenced from a layout.
Eric Fischer [Mon, 24 Jan 2011 21:49:39 +0000 (13:49 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Amith Yamasani [Mon, 24 Jan 2011 21:48:40 +0000 (13:48 -0800)]
Merge "NPE check in VpnSettings." into honeycomb
Eric Fischer [Mon, 24 Jan 2011 21:47:26 +0000 (13:47 -0800)]
Merge "Restore deleted string still referenced from a layout." into honeycomb
Eric Fischer [Mon, 24 Jan 2011 21:31:35 +0000 (13:31 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I82e0e6690e55a8dc676ff707565c964628d848a4
Eric Fischer [Mon, 24 Jan 2011 20:48:06 +0000 (12:48 -0800)]
Restore deleted string still referenced from a layout.
Change-Id: Ief261e16780ad04e53ebac1202d94146cf14e51c
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.
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
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
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
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
Justin Ho [Mon, 24 Jan 2011 17:47:21 +0000 (09:47 -0800)]
Merge "Updated Bluetooth assets to fix sizing problems" into honeycomb
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
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
Jim Miller [Mon, 24 Jan 2011 02:25:21 +0000 (18:25 -0800)]
Merge "Fix
3315488: Wrap OwnerInfo layout in a ScrollView" into honeycomb
Jim Miller [Mon, 24 Jan 2011 02:14:13 +0000 (18:14 -0800)]
Fix
3315488: Wrap OwnerInfo layout in a ScrollView
Change-Id: I5fc5a66c1a09ff4e45137469fee1b6de6b45c7a0
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
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
Justin Ho [Mon, 24 Jan 2011 00:44:54 +0000 (16:44 -0800)]
Updated Bluetooth assets to fix sizing problems
Change-Id: Ib9cbd0945c89e511b98c1153b55a22daf9c94fd7
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
Andy Stadler [Sat, 22 Jan 2011 00:25:22 +0000 (16:25 -0800)]
Maintain password quality while encrypted
Bug:
3378277
Change-Id: I68aae06c518eb514c1be38214d8c9918b0398f95
Daisuke Miyakawa [Fri, 21 Jan 2011 22:29:50 +0000 (14:29 -0800)]
Fix wifi flow
- show progress bar correctly
- stop inappropriately showing padding views
- expand the screen when successful.
Bug:
3378348
Bug:
3378341
Change-Id: I89ff31d24c050755c90fbf07cd4f56d8f0ddeac9
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
Justin Ho [Fri, 21 Jan 2011 22:52:57 +0000 (14:52 -0800)]
Merge "New Settings assets" into honeycomb
Justin Ho [Fri, 21 Jan 2011 22:25:22 +0000 (14:25 -0800)]
New Settings assets
Change-Id: I1d3309d4e5f9ebb95c2907440ffae69bf8167ce3
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.
Jason parks [Fri, 21 Jan 2011 22:18:52 +0000 (14:18 -0800)]
Merge "Accquire a wakelock while encrypting." into honeycomb
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
Jason parks [Fri, 21 Jan 2011 21:48:20 +0000 (15:48 -0600)]
Accquire a wakelock while encrypting.
Bug:
3375491
Change-Id: Ief7dbb450800104f4977ab31f93a1e1a994b25ad
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
Jason parks [Fri, 21 Jan 2011 20:36:12 +0000 (12:36 -0800)]
am
666800a2: Remove unused code.
* commit '
666800a237066457c5703fc7c746a5d477249d59':
Remove unused code.
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.
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.
Jason parks [Fri, 21 Jan 2011 00:48:55 +0000 (18:48 -0600)]
Remove unused code.
Change-Id: If9fd0f0229721ec1cdce583e6d3180d691213f23
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
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
Amith Yamasani [Fri, 21 Jan 2011 17:28:31 +0000 (09:28 -0800)]
NPE check in VpnSettings.
Bug:
3368545
Also fix a couple of bugs in TetherSettings:
Bug:
3090156 - view was being reused without removing from old dialog
Bug:
3368493 - preference being removed a second time
Change-Id: I8fe513d41e1f3af6994783be5ead69b6bd205711
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
Daisuke Miyakawa [Fri, 21 Jan 2011 07:35:46 +0000 (23:35 -0800)]
Use correct wording for SteupWizard
Bug:
3375688
Change-Id: Id8cdfc5347092277429c0a791fb45d55a7236230
satok [Fri, 21 Jan 2011 02:28:15 +0000 (18:28 -0800)]
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
satok [Fri, 21 Jan 2011 02:25:15 +0000 (18:25 -0800)]
Merge "Disable the checkbox even if there is a hard keyboard" into honeycomb
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
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.
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.
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
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.
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.
Daisuke Miyakawa [Fri, 21 Jan 2011 00:02:07 +0000 (16:02 -0800)]
Rename title for Date Time setup
Bug:
3374552
Change-Id: I37a4ac3f7fb1a9f0cf9624aba2a69dd85e9743ac
Jason parks [Thu, 20 Jan 2011 23:58:02 +0000 (15:58 -0800)]
Merge "More work on the CryptKeeper." into honeycomb
Jason parks [Thu, 20 Jan 2011 23:50:55 +0000 (15:50 -0800)]
Merge "Encrypt inplace settings." into honeycomb
Daisuke Miyakawa [Thu, 20 Jan 2011 22:59:39 +0000 (14:59 -0800)]
Merge "Use new backgrounds in wifi setup for xl" into honeycomb
Daisuke Miyakawa [Thu, 20 Jan 2011 20:39:27 +0000 (12:39 -0800)]
Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb
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
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
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
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
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.
Roy West [Thu, 20 Jan 2011 18:06:33 +0000 (10:06 -0800)]
Tidy up Internal storage screen text.
Change-Id: Ia1b3b79a6df1756c2a4ff9440463771cfa308c13
satok [Thu, 20 Jan 2011 17:35:59 +0000 (02:35 +0900)]
Disable the checkbox even if there is a hard keyboard
Change-Id: I9ef8ce273fd72327089ada1133d923715645a141
Ken Wakasa [Thu, 20 Jan 2011 16:14:15 +0000 (08:14 -0800)]
am
5a813ba7: Refine InputMethodInfo API
* commit '
5a813ba7f99f1c797ead4a58fdf05f91296158a4':
Refine InputMethodInfo API
Ken Wakasa [Thu, 20 Jan 2011 13:29:34 +0000 (22:29 +0900)]
Refine InputMethodInfo API
bug:
3370297
Change-Id: Ifaaad399586ee5b842f9b7762281d76e7969d24c
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
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
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
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
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.
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
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
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.
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
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
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.
Hung-ying Tyan [Wed, 19 Jan 2011 08:49:47 +0000 (16:49 +0800)]
Make VpnSettings use new synchronous VpnService API.
Change-Id: Ib400c968981f9f8642a1452011faaade0d5bde57
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.
Daisuke Miyakawa [Thu, 20 Jan 2011 00:36:14 +0000 (16:36 -0800)]
Merge "Fix Wifi setup for xl." into honeycomb
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
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.
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