PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,193 Commits 1 Branch 0 Tags
c73982cd819a8c097c57c7fa1d938f48fbbefc4d
Commit Graph

3193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glenn Kasten
c73982cd81 Roy West's fix is stuck in auto-merger 
Change-Id: I3290227e95911adc2c2cfc4f4a3b9eceb8066e35
 2011-01-26 18:05:54 -08:00
Roy West
0251821a49 am c29ec0b4: am ae3e3188: Merge "Editing encryption strings." into honeycomb 
* commit 'c29ec0b45ff38258b3190fdd5e586fee8039b828':
  Editing encryption strings.
 2011-01-26 15:46:12 -08:00
Roy West
c29ec0b45f am ae3e3188: Merge "Editing encryption strings." into honeycomb 
* commit 'ae3e3188120eb89acc5dc0a06803ae8274aeb900':
  Editing encryption strings.
 2011-01-26 15:43:13 -08:00
Roy West
ae3e318812 Merge "Editing encryption strings." into honeycomb 2011-01-26 15:41:11 -08:00
Roy West
302c14a241 Editing encryption strings. 
Change-Id: Ia7c12ea353f1a2dfee3125d2c620980ddd825570
 2011-01-26 15:38:38 -08:00
Jake Hamby
9def4c58ab am 03c92bef: am 1f5be05e: Merge "Implement "show received files" preference item." into honeycomb 
* commit '03c92beffe6e72cbe69771fb52fb5e1bb9271d95':
  Implement "show received files" preference item.
 2011-01-26 13:44:31 -08:00
Jake Hamby
03c92beffe am 1f5be05e: Merge "Implement "show received files" preference item." into honeycomb 
* commit '1f5be05ee5ec5c4e84dc0ace9e88a5ef8f2e2b64':
  Implement "show received files" preference item.
 2011-01-26 13:42:49 -08:00
Jake Hamby
1f5be05ee5 Merge "Implement "show received files" preference item." into honeycomb 2011-01-26 13:40:37 -08:00
Amith Yamasani
295a365c18 am 23bb90c1: am ae71d89a: Merge "Update airplane mode checkbox when toggled from system bar." into honeycomb 
* commit '23bb90c1a73254400024566ec989de7d5047907c':
  Update airplane mode checkbox when toggled from system bar.
 2011-01-26 13:20:00 -08:00
Amith Yamasani
23bb90c1a7 am ae71d89a: Merge "Update airplane mode checkbox when toggled from system bar." into honeycomb 
* commit 'ae71d89a6bc7ebd352c624297481081475907802':
  Update airplane mode checkbox when toggled from system bar.
 2011-01-26 13:18:44 -08:00
Amith Yamasani
ae71d89a6b Merge "Update airplane mode checkbox when toggled from system bar." into honeycomb 2011-01-26 13:16:30 -08:00
Roy West
5f1900ce54 am 192b71ac: am 5f765f7c: Fix to bug 3389385. 
* commit '192b71ac792932939d7d23cee1f04e30105cf75d':
  Fix to bug 3389385.
 2011-01-26 12:47:57 -08:00
Roy West
192b71ac79 am 5f765f7c: Fix to bug 3389385. 
* commit '5f765f7ca02543094eb6a89af7fcd4e43787a8f4':
  Fix to bug 3389385.
 2011-01-26 12:45:17 -08:00
Roy West
5f765f7ca0 Fix to bug 3389385. 
Change-Id: Ibf0d0ec3272c3b59fb20b837a739aaa99b1986b5
 2011-01-26 12:27:44 -08:00
Amith Yamasani
b13e56b8dd am 6f3bca71: am fa782f5e: Merge "Hidden AddAccount activity doesn\'t need to deal with orientation changes." into honeycomb 
* commit '6f3bca7157044d32a1e2bb24cd1053d9f59ea8e1':
  Hidden AddAccount activity doesn't need to deal with orientation changes.
 2011-01-26 10:56:13 -08:00
Amith Yamasani
6f3bca7157 am fa782f5e: Merge "Hidden AddAccount activity doesn\'t need to deal with orientation changes." into honeycomb 
* commit 'fa782f5ee3b925fb242c1786852e93c932d97cb5':
  Hidden AddAccount activity doesn't need to deal with orientation changes.
 2011-01-26 10:53:49 -08:00
Amith Yamasani
fa782f5ee3 Merge "Hidden AddAccount activity doesn't need to deal with orientation changes." into honeycomb 2011-01-26 10:51:36 -08:00
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
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