Commit Graph

3828 Commits

Author SHA1 Message Date
Jake Hamby
4ee12032a3 Implement "show received files" preference item.
Add handler to send an intent to the Bluetooth OPP app to show the
list of received files to the user.

Bug: 3167219
Change-Id: I59e18559a0c35add7f1be56a5f040dae4dccc7f1
2011-01-26 10:51:32 -08:00
Amith Yamasani
585eda6191 Hidden AddAccount activity doesn't need to deal with orientation changes.
Bug: 3300523
Change-Id: I53e02e390267b1a88a6ae424aca18df439501f6d
2011-01-26 10:37:17 -08:00
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
Chung-yih Wang
2b117d69ea am f003841c: am 09b77105: Make sure the profile list is consistent.
* commit 'f003841c5285452597c2e48bac8efc6262978bb4':
  Make sure the profile list is consistent.
2011-01-26 00:51:46 -08:00
Chung-yih Wang
f003841c52 am 09b77105: Make sure the profile list is consistent.
* commit '09b77105fb6c58075bb5586ba8087b4de9e5860e':
  Make sure the profile list is consistent.
2011-01-26 00:49:22 -08:00
Chung-yih Wang
09b77105fb Make sure the profile list is consistent.
Since we may have more than one instance of VpnSettings, we have to make
the VPN profile list consistent between instances.

bug:3381902

Change-Id: Ic3128646c7fc6ee2a8c0ea6ce339d76115d7c05b
2011-01-26 16:17:24 +08:00
Hung-ying Tyan
d455e59292 am 24ebc57b: am f6ac4296: Merge "Fix alert dialogs in VpnSettings." into honeycomb
* commit '24ebc57bb4f058295cbeb2ad7e1d8692ba81c460':
  Fix alert dialogs in VpnSettings.
2011-01-26 00:10:43 -08:00
Hung-ying Tyan
24ebc57bb4 am f6ac4296: Merge "Fix alert dialogs in VpnSettings." into honeycomb
* commit 'f6ac42968f1b21ab6300bdc211a050fc4cada1af':
  Fix alert dialogs in VpnSettings.
2011-01-26 00:09:18 -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
9027ea5c3d am 27fe9b4a: am 579a7ddb: Merge "Fix issue #3343297 Settings force close when try to..." into honeycomb
* commit '27fe9b4a9b364d48a0d500549ca811ea2b86cefa':
  Fix issue #3343297 Settings force close when try to...
2011-01-25 22:40:43 -08:00
Dianne Hackborn
27fe9b4a9b am 579a7ddb: Merge "Fix issue #3343297 Settings force close when try to..." into honeycomb
* commit '579a7ddb225ea3e59ea5383e49b847ff627ec9aa':
  Fix issue #3343297 Settings force close when try to...
2011-01-25 22:39:26 -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
3030a4407d am 069b5123: am 735e0f00: Merge "Rearrange Applications settings items." into honeycomb
* commit '069b512347ce6f28ce5e1a882dd634968645199f':
  Rearrange Applications settings items.
2011-01-25 21:47:24 -08:00
Amith Yamasani
069b512347 am 735e0f00: Merge "Rearrange Applications settings items." into honeycomb
* commit '735e0f0079572c0fc43ed8662adbaf1d1716cb98':
  Rearrange Applications settings items.
2011-01-25 21:45:45 -08:00
Amith Yamasani
df86f76213 am ff04e6ac: am 1fa2ab82: Merge "Fix missing title for WiFi Advanced settings." into honeycomb
* commit 'ff04e6ac8615bd091ccb835c517f1a9d111d03f9':
  Fix missing title for WiFi Advanced settings.
2011-01-25 21:45:26 -08:00
Amith Yamasani
ff04e6ac86 am 1fa2ab82: Merge "Fix missing title for WiFi Advanced settings." into honeycomb
* commit '1fa2ab82fb798854c500162d205c759d7cf6c24e':
  Fix missing title for WiFi Advanced settings.
2011-01-25 21:43:46 -08:00
Amith Yamasani
735e0f0079 Merge "Rearrange Applications settings items." into honeycomb 2011-01-25 21:43:19 -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
1ed6b13aeb am e6df7871: am 9e89462d: Merge "Use expander assets for bluetooth profile preference." into honeycomb
* commit 'e6df78714dcdd4bfa535fee8dd1153fcbdc3456b':
  Use expander assets for bluetooth profile preference.
2011-01-25 18:38:44 -08:00
Justin Ho
e6df78714d am 9e89462d: Merge "Use expander assets for bluetooth profile preference." into honeycomb
* commit '9e89462d280f189420b49a8d609cf3f99e55d178':
  Use expander assets for bluetooth profile preference.
2011-01-25 18:36:06 -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
4bcb4ffd1b am 98dd5cf5: am 3753def3: Merge "Allow OnCancelListener and OnDismissListener in Settings app" into honeycomb
* commit '98dd5cf5e5b8cdc5e7433f51d812c7a8f584db5c':
  Allow OnCancelListener and OnDismissListener in Settings app
2011-01-25 18:05:01 -08:00
Hung-ying Tyan
98dd5cf5e5 am 3753def3: Merge "Allow OnCancelListener and OnDismissListener in Settings app" into honeycomb
* commit '3753def39da8a4c63ffa787f2572defbc189d7c5':
  Allow OnCancelListener and OnDismissListener in Settings app
2011-01-25 18:02:43 -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
Amith Yamasani
a27573522e Rearrange Applications settings items.
Bug: 3337264
Change-Id: I955c15f7db791167b97b04beaeafc2953bdccd76
2011-01-25 14:56:44 -08:00
Jake Hamby
422b2b2c42 am 7bfb8601: am 51cd0d6d: Remove "Allow incoming file transfers" option from BT settings.
* commit '7bfb8601c80c915d2eafd22cdb73079168f58c6f':
  Remove "Allow incoming file transfers" option from BT settings.
2011-01-25 14:44:10 -08:00
Jake Hamby
7bfb8601c8 am 51cd0d6d: Remove "Allow incoming file transfers" option from BT settings.
* commit '51cd0d6d29c8f8f5320968f778b04b448984abc8':
  Remove "Allow incoming file transfers" option from BT settings.
2011-01-25 14:41:38 -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
Eric Fischer
5a1948a6e4 am 6418d373: (-s ours) Import translations for additional languages.
* commit '6418d373679ef0b73701bacc1de34f68f1c9ade8':
  Import translations for additional languages.
2011-01-25 12:52:52 -08:00
Jim Miller
786f62159f am de9b70f4: am a34279fb: Fix 3383575: use styled attribs and update layout
* commit 'de9b70f4df471a5548b9ee6779fcb1509d4e9f03':
  Fix 3383575: use styled attribs and update layout
2011-01-25 12:43:44 -08:00
Jim Miller
de9b70f4df am a34279fb: Fix 3383575: use styled attribs and update layout
* commit 'a34279fb2a109d45e88504ce9bc292d7fc7cf2c2':
  Fix 3383575: use styled attribs and update layout
2011-01-25 12:41:04 -08:00
Jim Miller
a34279fb2a 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
2011-01-25 12:29:35 -08:00
Jason parks
fe6aae82a2 am 4b2a602e: am 323fa9c6: Merge "Display the correct encryption settings." into honeycomb
* commit '4b2a602eaac76ab117e96271ac4474a0de15795e':
  Display the correct encryption settings.
2011-01-25 09:59:07 -08:00
Jason parks
4b2a602eaa am 323fa9c6: Merge "Display the correct encryption settings." into honeycomb
* commit '323fa9c669da74cf1dde982c982f7ea9c0c1b5a8':
  Display the correct encryption settings.
2011-01-25 09:56:00 -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
f9ea5f9f78 am d065fffc: am af6d7cf2: Merge "More UI tweaks." into honeycomb
* commit 'd065fffcf5e13af5638d232d7a7ca38cd0aa9e46':
  More UI tweaks.
2011-01-25 07:36:57 -08:00
Jason parks
d065fffcf5 am af6d7cf2: Merge "More UI tweaks." into honeycomb
* commit 'af6d7cf23ca5ca86c39845711f431e76b877a31e':
  More UI tweaks.
2011-01-25 07:28:28 -08: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
0447d38db3 am 89b04d70: am 0385cf14: Fix issue #3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
* commit '89b04d70f227b0a191ec7be23f26adbd7685f8f1':
  Fix issue #3306021 NPE at android.app.AlertDialog.getDefaultDialogTheme(AlertDialog.java)
2011-01-24 22:31:19 -08:00
Amith Yamasani
29dd8eb796 am 0cd3fd6a: am 48e031c7: Merge "Tabletize Device administrator screen and fix the layout for DeviceAdminAdd." into honeycomb
* commit '0cd3fd6a20b9bfe2b6102b9565c97fa0942400df':
  Tabletize Device administrator screen and fix the layout for DeviceAdminAdd.
2011-01-24 22:31:11 -08:00
Dianne Hackborn
89b04d70f2 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)
2011-01-24 22:12:31 -08:00
Amith Yamasani
0cd3fd6a20 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.
2011-01-24 22:12:22 -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