OSDN Git Service
Andy Stadler [Tue, 1 Feb 2011 03:21:37 +0000 (19:21 -0800)]
More CryptKeeper UI work.
* Implemented failure case.
* More pixel perfect
* Remove the animation
* Display the encroid on the blank screen
* Remove the back button.
* Fix portrait mode screens
Bug:
3384231
Bug:
3394103
Bug:
3388721
Bug:
3381450
Bug:
3406278
Bug:
3351832
Change-Id: Ib763c8b577198deb45255acc767bc6d5409efc0c
Eric Fischer [Tue, 1 Feb 2011 01:28:26 +0000 (17:28 -0800)]
Merge "Import revised translations. DO NOT MERGE. Bug
3394542" into honeycomb
Amith Yamasani [Mon, 31 Jan 2011 23:20:30 +0000 (15:20 -0800)]
Merge "Fix crash after adding a word to the user dictionary." into honeycomb
Eric Fischer [Mon, 31 Jan 2011 20:48:02 +0000 (12:48 -0800)]
Import revised translations. DO NOT MERGE. Bug
3394542
Change-Id: Id6c2e64725cb9177263d9b9249125378fe04b29a
Amith Yamasani [Mon, 31 Jan 2011 20:46:57 +0000 (12:46 -0800)]
Fix crash after adding a word to the user dictionary.
Bug:
3407951
Make sure that the parent fragment is a SettingsPreferenceFragment. Otherwise it's not
necessary to manage the mDialogFragment.
Change-Id: I331a3507fe11a7331ff24ecf64fe8c8c3f613636
Daisuke Miyakawa [Mon, 31 Jan 2011 19:55:43 +0000 (11:55 -0800)]
Merge "Disable back button on SetupWizard flow." into honeycomb
Daisuke Miyakawa [Mon, 31 Jan 2011 19:03:09 +0000 (11:03 -0800)]
Disable back button on SetupWizard flow.
Bug:
3383738
Change-Id: Ie06d85ee22482f865a8173a45d0645699427729e
Andy Stadler [Mon, 31 Jan 2011 18:15:53 +0000 (10:15 -0800)]
Final cleanup of "password required" dialog
Bug:
3406068
Change-Id: I65c0e8f37236194565cb3a1cf022dfdfdc5c0044
Justin Ho [Mon, 31 Jan 2011 04:07:42 +0000 (20:07 -0800)]
Merge "Updating Settings icons in side menu Bug:
3362749" into honeycomb
Justin Ho [Mon, 31 Jan 2011 04:04:46 +0000 (20:04 -0800)]
Updating Settings icons in side menu
Bug:
3362749
Change-Id: I95c2d4a69e05fe5af3b89f4f3ee9e635403b5015
Andy Stadler [Mon, 31 Jan 2011 01:09:11 +0000 (17:09 -0800)]
Merge "Improvements to enable encryption steps" into honeycomb
Roy West [Mon, 31 Jan 2011 00:40:55 +0000 (16:40 -0800)]
Fix bug
3405977.
Change-Id: I85c285a1dc07ba6e87ba9103c01a79c50d23bf60
Andy Stadler [Mon, 31 Jan 2011 00:25:38 +0000 (16:25 -0800)]
Improvements to enable encryption steps
* Don't crash when user has pattern lock
* Updated text for final confirmation screen
* Show power & battery level warning text
* Updated layout for both confirmation screens (cleaned up margins,
removed hardcoded text sizes, made settings & confirm consistent).
* Added comments for translators to all cryptkeeper strings
Bug:
3383190
Bug:
3383292
Bug:
3405707
Change-Id: I1adcdd963a549eb6541662ff941d245db5563710
The Android Open Source Project [Sun, 30 Jan 2011 20:42:26 +0000 (12:42 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: I2693f4f400c0c56df04ccb571bfd3420c6f0d697
Justin Ho [Sat, 29 Jan 2011 21:19:05 +0000 (13:19 -0800)]
Deprecating old Settings icon completely
Updating to new Settings launcher icon
Bug:
3362749
Change-Id: I4d33650b68aac3aa9ddd56d2acab614f80266840
Daisuke Miyakawa [Sat, 29 Jan 2011 19:55:24 +0000 (11:55 -0800)]
Take care of null in Wifi setup.
The preference isn't available in Wifi setup launched from
SetupWizard, causing NPE.
Bug:
3404998
Change-Id: Ia0dabea95e5e7424698a269c0851d610fd305309
Eric Fischer [Sat, 29 Jan 2011 19:25:03 +0000 (11:25 -0800)]
am
5a2bb8c0: (-s ours) Import revised translations. DO NOT MERGE
* commit '
5a2bb8c0dc33837696f80d6690d51f031d7884c8':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Jan 2011 18:47:04 +0000 (10:47 -0800)]
am
95112e5b: (-s ours) Import revised translations. DO NOT MERGE
* commit '
95112e5b9810b6a70974ace6ee1c017b57e466af':
Import revised translations. DO NOT MERGE
Irfan Sheriff [Sat, 29 Jan 2011 16:58:23 +0000 (08:58 -0800)]
Change sleep policy strings
Bug:
3404049
Change-Id: I8ad3eae778c1695fc98aaca01ef26677fa8106f1
Hung-ying Tyan [Sat, 29 Jan 2011 10:29:15 +0000 (02:29 -0800)]
Merge "Clear mDialogFragment when it's detached" into honeycomb
Vasu Nori [Sat, 29 Jan 2011 02:39:38 +0000 (18:39 -0800)]
Merge "bug:
3402846 fix settings->storage" into honeycomb
Vasu Nori [Fri, 28 Jan 2011 22:32:45 +0000 (14:32 -0800)]
bug:
3402846 fix settings->storage
Change-Id: Icb9e33cb0336f87f43797330f56e9c8fcbe2dfd0
Irfan Sheriff [Sat, 29 Jan 2011 00:42:33 +0000 (16:42 -0800)]
Move sleep policy to main settings page
Bug:
3404049
Change-Id: I091abd737894a4adb9ebfc08b8e63bc3224b971c
Daisuke Miyakawa [Sat, 29 Jan 2011 00:23:45 +0000 (16:23 -0800)]
Merge "Enlarge texts and fit the other elements" into honeycomb
Eric Fischer [Fri, 28 Jan 2011 23:10:11 +0000 (15:10 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Fri, 28 Jan 2011 22:58:24 +0000 (14:58 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ifb50963e88a2d7c48440f0be4b411ede41ec0998
Daisuke Miyakawa [Thu, 27 Jan 2011 02:37:10 +0000 (18:37 -0800)]
Enlarge texts and fit the other elements
Basically set text size to 18sp and change layouts
along with the new design.
- Add custom list item xml for Wi-Fi security field
rename existing "custom_list_item.xml" to appropriate
name so that we won't be confused with their naming.
- Use the custom xml just in SetupWizard.
Bug:
3364731
Change-Id: I014903277a03c359ea193dd0f0a37c84ade19fa1
Jake Hamby [Fri, 28 Jan 2011 22:21:19 +0000 (14:21 -0800)]
Merge "Don't display extra A2DP profile icon for OPP." into honeycomb
Eric Fischer [Fri, 28 Jan 2011 21:21:54 +0000 (13:21 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ic85518cac2e5c92d829bc71da778b68259524624
Daisuke Miyakawa [Fri, 28 Jan 2011 20:36:07 +0000 (12:36 -0800)]
Merge "Disable "add network" button." into honeycomb
Daisuke Miyakawa [Fri, 28 Jan 2011 17:53:52 +0000 (09:53 -0800)]
Disable "add network" button.
It has broken UI which possibly get users stuck.
Bug:
3400715
Change-Id: Ic618078bc70a7db35ec22e6382b9486e92630120
Hung-ying Tyan [Fri, 28 Jan 2011 08:17:27 +0000 (16:17 +0800)]
Clear mDialogFragment when it's detached
and re-associate it when it's re-created.
Before this CL, the association is gone when fragment goes through the pause-resume
cycle.
Similarly, restore onDismiss and onCancel listeners in VpnSettings.onCreateDialog(),
restore states in onCreate() instead of onActivityCreated() so that screen rotation
can be handled correctly.
Now that profiles are shared between Settings instances, always handle state change
in VpnSettings.changeState() so that state changed in one instance can be conveyed
to the other and preferences can be correctly enabled/disabled.
In additions, fix some trivial mistakes in VpnSettings.
Bug:
3396394
Change-Id: I242e1ed6c6d410b4dfefb373d8f98266fc9b46d0
satok [Fri, 28 Jan 2011 08:36:27 +0000 (17:36 +0900)]
Remove invalid call of "clearFocus" in SetupWizard......
Bug:
3398097
- Also disabled logging......
- Once you call "clearFocus", onFocusChanged will be called and
EditText will try to show the keyboard again. And while bringing up the keyboard,
the activity is changed and it will end up with the keyboard being shown in the next activity...
Change-Id: If4d3876d4950bb2583c5588f462a94d022d6a7cf
Dianne Hackborn [Fri, 28 Jan 2011 07:19:13 +0000 (23:19 -0800)]
Merge "Fix issue #
3400255 Dialog fragments crash on rotation in Settings app" into honeycomb
Dianne Hackborn [Fri, 28 Jan 2011 04:39:21 +0000 (20:39 -0800)]
Fix issue #
3400255 Dialog fragments crash on rotation in Settings app
Change-Id: I337c1fb41e3fbedd7982418df497487481bb35d2
Jake Hamby [Fri, 28 Jan 2011 04:32:21 +0000 (20:32 -0800)]
Don't display extra A2DP profile icon for OPP.
The getDrawableResource() method for OppProfileManager was returning
the resource ID for the A2DP icon. This was causing an extra headset
icon to be drawn for devices supporting OPP, when no icon should be
shown for this profile. Changed to return 0.
Bug:
3368197
Change-Id: Idcadaf59fe53301544cda215ca24f15608b2d727
Justin Ho [Fri, 28 Jan 2011 03:06:24 +0000 (19:06 -0800)]
Merge "Updating Delete and Refresh icons to Honeycomb style" into honeycomb
Jake Hamby [Fri, 28 Jan 2011 02:15:51 +0000 (18:15 -0800)]
Increase size of BT profile icons and decrease alpha for inactive profiles
Increase the size of the Bluetooth profile icons from 20dp to 30dp.
Decrease the alpha for disabled profile icons to 50% of theme default.
Bug:
3400851
Change-Id: Ieb5ecb01ccbd7185d383828e0d9c9f78525ee0c4
Justin Ho [Fri, 28 Jan 2011 01:59:23 +0000 (17:59 -0800)]
Updating Delete and Refresh icons to Honeycomb style
Bug:
3362749
Change-Id: Ib4b61c9e7db05b0627c1f353d3747268455dab6c
Amith Yamasani [Thu, 27 Jan 2011 23:08:34 +0000 (15:08 -0800)]
Merge "Use the correct resource id for Battery use shortcut title." into honeycomb
Amith Yamasani [Thu, 27 Jan 2011 22:58:21 +0000 (14:58 -0800)]
Use the correct resource id for Battery use shortcut title.
Bug:
3399262
When displaying a list of shortcuts to settings screens, "Storage
settings" was used instead of "Battery use".
Change-Id: I4d445f188fc45d66623dc83e9eb2f9b045899561
Jake Hamby [Thu, 27 Jan 2011 22:05:44 +0000 (14:05 -0800)]
Merge "Fix settings NPE crash on launch." into honeycomb
Eric Fischer [Thu, 27 Jan 2011 22:04:11 +0000 (14:04 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I64435ed3b620c5e748b0f15017d548eadf7adbd5
Justin Ho [Thu, 27 Jan 2011 18:14:54 +0000 (10:14 -0800)]
Adding missing hdpi assets
Change-Id: I791d331d7dbc93af6869d741eaa4282e7558a874
Jason parks [Thu, 27 Jan 2011 18:11:00 +0000 (10:11 -0800)]
Merge "Fix the build." into honeycomb
Jason parks [Thu, 27 Jan 2011 18:08:44 +0000 (12:08 -0600)]
Fix the build.
I think I checked in the wrong file before.
Change-Id: Ie426bb5e865ea17f219ee07d3eb8cdd6f06e8cc7
Justin Ho [Thu, 27 Jan 2011 17:48:18 +0000 (09:48 -0800)]
Merge "New tab assets for Honeycomb" into honeycomb
Justin Ho [Thu, 27 Jan 2011 17:47:35 +0000 (09:47 -0800)]
New tab assets for Honeycomb
Change-Id: Ia955180781142295991df179fa419690fd0ffeee
Jason parks [Wed, 26 Jan 2011 19:11:42 +0000 (13:11 -0600)]
More work on the Crypt Keeper.
* Use the DPM to determine if we are encrypted.
* Fix misspelling (Comfirm -> Confirm).
* Animate to black when enabling encryption.
* Add holo droid background.
* Change the progress bar to indterminate.
* Display the percentage complete in the status line.
* Fixed bug
3388097. You will no longer have to unplug your device to start encryption. This line is intentionally long. I could make it shorter but I am proving a point: <magic>overflow: auto;</magic>.
* Actually hold onto the wakelock to prvent the device from sleeping.
* Implement onStop() as a orientation change can happen at boot. This will start the activity twice and there will be multiple handlers with messages.
Change-Id: Ia752d106c39e0d81431e856f8f500182e8ec1abd
Jake Hamby [Thu, 27 Jan 2011 01:49:20 +0000 (17:49 -0800)]
Fix settings NPE crash on launch.
Sometimes when the settings app is resumed, HeadsetProfileManager's
getConnectedDevices() method is called before the onServiceConnected()
callback gives us the proxy object, causing an NPE. Check that we
have the proxy object, and return an empty list otherwise. The
correct states will be shown in the UI because the
onServiceConnected() callback makes its own call to getConnectedDevices()
to set the correct headset profile state.
Bug:
3378431
Change-Id: I364ade0804fb2090378438c8721afef6cac2b0b8
Dianne Hackborn [Thu, 27 Jan 2011 01:35:59 +0000 (17:35 -0800)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb
Eric Fischer [Thu, 27 Jan 2011 00:39:47 +0000 (16:39 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I00d851d7635880d85a4880e5a9201cbcabc101c9
Roy West [Thu, 27 Jan 2011 00:34:40 +0000 (16:34 -0800)]
Merge "Fix build; dumb syntax error." into honeycomb
Roy West [Thu, 27 Jan 2011 00:31:21 +0000 (16:31 -0800)]
Fix build; dumb syntax error.
Change-Id: I1204650796df7a49c5221821f2d485fa7e312be6
Jim Miller [Thu, 27 Jan 2011 00:25:32 +0000 (16:25 -0800)]
Merge "Fix
3395616: Show IME by default when seting/changing password" into honeycomb
Jim Miller [Thu, 27 Jan 2011 00:10:26 +0000 (16:10 -0800)]
Fix
3395616: Show IME by default when seting/changing password
Change-Id: I2c110042e58420bdc937582e840227edb93909a5
Roy West [Wed, 26 Jan 2011 23:41:11 +0000 (15:41 -0800)]
Merge "Editing encryption strings." into honeycomb
Roy West [Wed, 26 Jan 2011 22:10:55 +0000 (14:10 -0800)]
Editing encryption strings.
Change-Id: Ia7c12ea353f1a2dfee3125d2c620980ddd825570
Jake Hamby [Wed, 26 Jan 2011 21:40:37 +0000 (13:40 -0800)]
Merge "Implement "show received files" preference item." into honeycomb
Amith Yamasani [Wed, 26 Jan 2011 21:16:30 +0000 (13:16 -0800)]
Merge "Update airplane mode checkbox when toggled from system bar." into honeycomb
Roy West [Wed, 26 Jan 2011 20:27:44 +0000 (12:27 -0800)]
Fix to bug
3389385.
Change-Id: Ibf0d0ec3272c3b59fb20b837a739aaa99b1986b5
Amith Yamasani [Wed, 26 Jan 2011 18:51:36 +0000 (10:51 -0800)]
Merge "Hidden AddAccount activity doesn't need to deal with orientation changes." into honeycomb
Jake Hamby [Wed, 26 Jan 2011 03:56:58 +0000 (19:56 -0800)]
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
Amith Yamasani [Wed, 26 Jan 2011 18:37:17 +0000 (10:37 -0800)]
Hidden AddAccount activity doesn't need to deal with orientation changes.
Bug:
3300523
Change-Id: I53e02e390267b1a88a6ae424aca18df439501f6d
Amith Yamasani [Wed, 26 Jan 2011 17:56:44 +0000 (09:56 -0800)]
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
Chung-yih Wang [Fri, 21 Jan 2011 09:22:29 +0000 (17:22 +0800)]
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
Hung-ying Tyan [Wed, 26 Jan 2011 08:07:38 +0000 (00:07 -0800)]
Merge "Fix alert dialogs in VpnSettings." into honeycomb
Hung-ying Tyan [Mon, 24 Jan 2011 07:05:27 +0000 (15:05 +0800)]
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
Dianne Hackborn [Wed, 26 Jan 2011 06:37:42 +0000 (22:37 -0800)]
Merge "Fix issue #
3343297 Settings force close when try to..." into honeycomb
Dianne Hackborn [Wed, 26 Jan 2011 06:03:43 +0000 (22:03 -0800)]
Fix issue #
3343297 Settings force close when try to...
...end process in running service - IKXEVEREST-3023
Change-Id: I16403a260ccf06675d0e2e98573975d746bded91
Amith Yamasani [Wed, 26 Jan 2011 05:43:19 +0000 (21:43 -0800)]
Merge "Rearrange Applications settings items." into honeycomb
Amith Yamasani [Wed, 26 Jan 2011 05:42:11 +0000 (21:42 -0800)]
Merge "Fix missing title for WiFi Advanced settings." into honeycomb
Justin Ho [Wed, 26 Jan 2011 02:34:10 +0000 (18:34 -0800)]
Merge "Use expander assets for bluetooth profile preference." into honeycomb
Hung-ying Tyan [Wed, 26 Jan 2011 02:00:12 +0000 (18:00 -0800)]
Merge "Allow OnCancelListener and OnDismissListener in Settings app" into honeycomb
Amith Yamasani [Wed, 26 Jan 2011 01:20:43 +0000 (17:20 -0800)]
Use expander assets for bluetooth profile preference.
Also adjust some padding and set correct highlight background.
Bug:
3383060
Change-Id: I5a4abe98c49efd156523085418958b69df6c8d85
Amith Yamasani [Tue, 25 Jan 2011 22:56:44 +0000 (14:56 -0800)]
Rearrange Applications settings items.
Bug:
3337264
Change-Id: I955c15f7db791167b97b04beaeafc2953bdccd76
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
Amith Yamasani [Tue, 25 Jan 2011 20:56:53 +0000 (12:56 -0800)]
Fix missing title for WiFi Advanced settings.
Bug:
3360783
Change-Id: I8c22ce5a995eab26d300402471770c082f90a34a
Eric Fischer [Tue, 25 Jan 2011 20:52:52 +0000 (12:52 -0800)]
am
6418d373: (-s ours) Import translations for additional languages.
* commit '
6418d373679ef0b73701bacc1de34f68f1c9ade8':
Import translations for additional languages.
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: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 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 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:00:07 +0000 (14:00 -0800)]
Merge "Fix wifi flow" into honeycomb
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: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 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