Commit Graph

1642 Commits

Author SHA1 Message Date
Amith Yamasani
b98c00e710 Update airplane mode checkbox when toggled from system bar.
Bug: 3148095

Also fix an NPE crash I saw when exiting Settings immediately after toggling
the airplane mode.

Change-Id: I83eb2d90e203fd56b09269cf9fa8f74a4354834f
2011-01-26 09:56:44 -08:00
Hung-ying Tyan
f6ac42968f Merge "Fix alert dialogs in VpnSettings." into honeycomb 2011-01-26 00:07:38 -08:00
Hung-ying Tyan
adc83d8312 Fix alert dialogs in VpnSettings.
+ Don't check mDialogFragment.isVisible() in SettingsPreferenceFragment.removeDialog()
  as mDialogFragment may not be visible in parent fragment's onResume().
+ Replace mConnectDialog with mConnectDialogShowing and remove
  removeConnectDialog().
+ Dismiss alert dialogs in onPause() so that we don't need to maintain extra
  states during pause-resume cycle.

In addition, fix a NPE when startVpnTypeSelection().

Bug: 3381434
Bug: 3289365

Change-Id: Ic4aa87c7a618d95e86e45d6617f2ad7dab35f019
2011-01-26 15:50:33 +08:00
Dianne Hackborn
579a7ddb22 Merge "Fix issue #3343297 Settings force close when try to..." into honeycomb 2011-01-25 22:37:42 -08:00
Dianne Hackborn
25bda17a57 Fix issue #3343297 Settings force close when try to...
...end process in running service - IKXEVEREST-3023

Change-Id: I16403a260ccf06675d0e2e98573975d746bded91
2011-01-25 22:03:43 -08:00
Amith Yamasani
1fa2ab82fb Merge "Fix missing title for WiFi Advanced settings." into honeycomb 2011-01-25 21:42:11 -08:00
Justin Ho
9e89462d28 Merge "Use expander assets for bluetooth profile preference." into honeycomb 2011-01-25 18:34:10 -08:00
Hung-ying Tyan
3753def39d Merge "Allow OnCancelListener and OnDismissListener in Settings app" into honeycomb 2011-01-25 18:00:12 -08:00
Amith Yamasani
03b58dff82 Use expander assets for bluetooth profile preference.
Also adjust some padding and set correct highlight background.

Bug: 3383060
Change-Id: I5a4abe98c49efd156523085418958b69df6c8d85
2011-01-25 17:20:43 -08:00
Jake Hamby
51cd0d6d29 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
2011-01-25 13:57:30 -08:00
Amith Yamasani
9eb18f0015 Fix missing title for WiFi Advanced settings.
Bug: 3360783
Change-Id: I8c22ce5a995eab26d300402471770c082f90a34a
2011-01-25 12:56:53 -08:00
Jason parks
323fa9c669 Merge "Display the correct encryption settings." into honeycomb 2011-01-25 09:53:00 -08:00
Jason parks
4112199ed6 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
2011-01-25 10:29:50 -06:00
Jason parks
af6d7cf23c Merge "More UI tweaks." into honeycomb 2011-01-25 06:39:06 -08:00
Jason parks
f1dbf55819 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
2011-01-25 08:38:17 -06:00
Hung-ying Tyan
0ee51e04fb 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
2011-01-25 17:31:26 +08:00
Dianne Hackborn
0385cf14a1 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
2011-01-24 21:18:41 -08:00
Amith Yamasani
48e031c710 Merge "Tabletize Device administrator screen and fix the layout for DeviceAdminAdd." into honeycomb 2011-01-24 20:43:05 -08:00
Amith Yamasani
a1d0184166 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
2011-01-24 16:24:55 -08:00
Daisuke Miyakawa
3f5e524d5d Merge "Fix wifi flow" into honeycomb 2011-01-24 14:00:07 -08:00
Amith Yamasani
26bb586c9c Merge "NPE check in VpnSettings." into honeycomb 2011-01-24 13:48:40 -08:00
Amith Yamasani
b409b904d6 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
2011-01-24 11:40:31 -08:00
Adam Powell
a31be80ef0 Fix bug 3381583 - Settings action bar not refreshing menu content
Change-Id: I71416dbf691a6dacfb58c6ac3cc0df8233db8f44
2011-01-23 17:35:41 -08:00
Andy Stadler
6370c87a6b Maintain password quality while encrypted
Bug: 3378277
Change-Id: I68aae06c518eb514c1be38214d8c9918b0398f95
2011-01-21 16:25:22 -08:00
Daisuke Miyakawa
350b724d09 Fix wifi flow
- show progress bar correctly
- stop inappropriately showing padding views
- expand the screen when successful.

Bug: 3378348
Bug: 3378341
Change-Id: I89ff31d24c050755c90fbf07cd4f56d8f0ddeac9
2011-01-21 15:55:48 -08:00
Jason parks
f5f4c68787 Merge "Accquire a wakelock while encrypting." into honeycomb 2011-01-21 14:18:52 -08:00
Jason parks
35933812b1 Accquire a wakelock while encrypting.
Bug: 3375491
Change-Id: Ief7dbb450800104f4977ab31f93a1e1a994b25ad
2011-01-21 15:51:15 -06:00
Andy Stadler
3da38a0771 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
2011-01-21 13:38:45 -08:00
Jason parks
666800a237 Remove unused code.
Change-Id: If9fd0f0229721ec1cdce583e6d3180d691213f23
2011-01-21 13:55:57 -06:00
Jason parks
39f1e04079 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
2011-01-21 13:53:41 -06:00
Jason parks
dbf4322ab1 Change how we check to see if we should display the progress bar.
Change-Id: I779e229f82a11d570e832f3e8cc5b275939249e8
2011-01-21 13:52:18 -06:00
Amith Yamasani
476d795667 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
2011-01-21 11:27:29 -08:00
satok
f2d812a5d4 Merge "Disable the checkbox even if there is a hard keyboard" into honeycomb 2011-01-20 18:25:15 -08:00
Jason parks
43775c7f9b Merge "More work on the CryptKeeper." into honeycomb 2011-01-20 15:58:02 -08:00
Jason parks
a13e9c877c Merge "Encrypt inplace settings." into honeycomb 2011-01-20 15:50:55 -08:00
Daisuke Miyakawa
39281d0163 Merge "Use new backgrounds in wifi setup for xl" into honeycomb 2011-01-20 14:59:39 -08:00
Daisuke Miyakawa
392a06ed1e Merge "Let WifiPickerActivity show AdvancedSettings correctly." into honeycomb 2011-01-20 12:39:27 -08:00
Daisuke Miyakawa
ece3bef58d 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
2011-01-20 12:33:37 -08:00
Daisuke Miyakawa
8f533a6232 Use new backgrounds in wifi setup for xl
Bug: 3373467
Change-Id: Iccc9a4c36dc46a67e395c81a642646b8199be606
2011-01-20 12:28:47 -08:00
Amith Yamasani
7099436ca6 Merge "Add back the refresh button and fix refresh when restarted." into honeycomb 2011-01-20 12:08:41 -08:00
Amith Yamasani
1aae305fa0 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
2011-01-20 11:25:43 -08:00
satok
c080c0488e Disable the checkbox even if there is a hard keyboard
Change-Id: I9ef8ce273fd72327089ada1133d923715645a141
2011-01-21 02:35:59 +09:00
Ken Wakasa
5a813ba7f9 Refine InputMethodInfo API
bug: 3370297
Change-Id: Ifaaad399586ee5b842f9b7762281d76e7969d24c
2011-01-21 00:46:26 +09:00
Tadashi G. Takaoka
9f7320132b 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
2011-01-21 00:13:33 +09:00
Tadashi G. Takaoka
4c0100f48f Merge "Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS" into honeycomb 2011-01-20 05:18:01 -08:00
Chia-chi Yeh
9003862e25 Merge "Extract credential storage dialogs to a new activity." into honeycomb 2011-01-20 04:26:10 -08:00
Chia-chi Yeh
91d65a20af 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
2011-01-20 19:45:04 +08:00
Chung-yih Wang
a4491eafd4 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
2011-01-20 18:31:26 +08:00
Tadashi G. Takaoka
d38896c7d6 Rename action to ACTION_INPUT_METHOD_SUBTYPE_SETTINGS
Change-Id: I2aa16ecfffe3b575132437a9e3a071cd1c747e28
2011-01-20 17:58:29 +09:00
Hung-ying Tyan
62cc79ef96 Make VpnSettings use new synchronous VpnService API.
Change-Id: Ib400c968981f9f8642a1452011faaade0d5bde57
2011-01-20 12:48:53 +08:00