OSDN Git Service
Eric Fischer [Tue, 20 Sep 2011 22:38:38 +0000 (15:38 -0700)]
am
f85b8b1a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
f85b8b1a17d9c91d5fff5a55c1546544e682c4b1':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 20 Sep 2011 22:37:04 +0000 (15:37 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Freeman Ng [Tue, 20 Sep 2011 22:36:33 +0000 (15:36 -0700)]
am
01b20096: Merge "adjust char limit for translations" into ics-factoryrom
* commit '
01b2009608a1ce58711efac4541f4acad62e038c':
adjust char limit for translations
Freeman Ng [Tue, 20 Sep 2011 22:34:30 +0000 (15:34 -0700)]
Merge "adjust char limit for translations" into ics-factoryrom
Eric Fischer [Tue, 20 Sep 2011 22:24:00 +0000 (15:24 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I9f4fbeded8f7d068d70fb1ed29b414d1cc9e4d11
Freeman Ng [Tue, 20 Sep 2011 22:18:05 +0000 (15:18 -0700)]
adjust char limit for translations
bug:
5348039
Change-Id: I2c7153b3b8281398644a9a0ebdb1a4921af4f261
Amith Yamasani [Tue, 20 Sep 2011 22:13:35 +0000 (15:13 -0700)]
Merge "Allow shortcuts to Tethering and Data usage screens."
Eric Fischer [Tue, 20 Sep 2011 18:02:16 +0000 (11:02 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 20 Sep 2011 17:37:57 +0000 (10:37 -0700)]
Import revised translations.
Change-Id: Id6474f106ab35f9f0b9c799f3d9c3888868c6f58
Luca Zanolin [Tue, 20 Sep 2011 17:03:42 +0000 (10:03 -0700)]
Merge "Change title in the setting for "Speech" category"
Luca Zanolin [Tue, 20 Sep 2011 16:58:45 +0000 (17:58 +0100)]
Change title in the setting for "Speech" category
Bug:
5049218
Change-Id: I42a6726600459b9ff3f3ab25118f1c7896f705a8
The Android Open Source Project [Tue, 20 Sep 2011 14:43:27 +0000 (07:43 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Id11b3b3373d00ebc6afce94f21ca1b6edfcfca42
The Android Automerger [Tue, 20 Sep 2011 13:28:47 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Ben Komalo [Mon, 19 Sep 2011 23:55:51 +0000 (16:55 -0700)]
am
69dfd425: Merge "Mark Settings as a "core" app." into ics-factoryrom
* commit '
69dfd42520ccea4556a860b483e264a229293fa2':
Mark Settings as a "core" app.
Ben Komalo [Mon, 19 Sep 2011 23:52:32 +0000 (16:52 -0700)]
Merge "Mark Settings as a "core" app." into ics-factoryrom
Wink Saville [Mon, 19 Sep 2011 21:24:39 +0000 (14:24 -0700)]
Add Button to *#*#INFO#*#* for ims registration.
For testing add a button to toggle SystemProperty
persist.radio.imsregrequired
Bug:
5337311
Change-Id: Id2d8ffa4c67992245d80b0ccafb6ed719fa749cc
Wink Saville [Mon, 19 Sep 2011 22:02:02 +0000 (15:02 -0700)]
am
1e596f30: Add Button to *#*#INFO#*#* for ims registration.
* commit '
1e596f303520d211aebc87dfc0c08108efe80921':
Add Button to *#*#INFO#*#* for ims registration.
Ben Komalo [Mon, 19 Sep 2011 21:27:13 +0000 (14:27 -0700)]
Mark Settings as a "core" app.
This ensures settings is still loaded when the framework loads in a
minified state (e.g. while encrypting the device).
Bug:
5031399
Change-Id: I8c1c7331eb34c192abb18b9a77426f2e028baccb
Wink Saville [Mon, 19 Sep 2011 21:24:39 +0000 (14:24 -0700)]
Add Button to *#*#INFO#*#* for ims registration.
For testing add a button to toggle SystemProperty
persist.radio.imsregrequired
Bug:
5337311
Change-Id: Id2d8ffa4c67992245d80b0ccafb6ed719fa749cc
Amith Yamasani [Mon, 19 Sep 2011 20:25:52 +0000 (13:25 -0700)]
Allow shortcuts to Tethering and Data usage screens.
Bug:
5290301
Change-Id: Id271fd33a54adb38ce3312d4a03fd6f4a05394e8
Jeff Sharkey [Sun, 18 Sep 2011 23:17:37 +0000 (16:17 -0700)]
am
2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryrom
* commit '
2ae885210ef04d2533a2fc121a7f2b8770efa7e4':
Surface tethering stats in data usage.
Jeff Sharkey [Sun, 18 Sep 2011 23:15:53 +0000 (16:15 -0700)]
Merge "Surface tethering stats in data usage." into ics-factoryrom
Mike Lockwood [Sun, 18 Sep 2011 21:52:54 +0000 (17:52 -0400)]
Fix race condition in MTP/PTP checkbox updating
UsbManager.getDefaultFunction() might not return the updated state immediately
after changing the USB configuration, so do not rely on it for updating
after a checkbox has been clicked.
Change-Id: I5ae8d46854f24403cda2c62e006c742dcd257d1d
Bug:
5334777
Signed-off-by: Mike Lockwood <lockwood@android.com>
Jeff Sharkey [Fri, 16 Sep 2011 08:52:39 +0000 (01:52 -0700)]
Surface tethering stats in data usage.
Bug:
5244846
Change-Id: Ib4ac03ab634278714576a66ef8d6fdbc6d15c82a
Danielle Millett [Sat, 17 Sep 2011 00:48:35 +0000 (17:48 -0700)]
Merge "Adding info explaining facelock's backup lock"
Eric Fischer [Fri, 16 Sep 2011 23:27:30 +0000 (16:27 -0700)]
am
f4d6c876: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit '
f4d6c876218124364e0e044426cc86058b20d935':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 16 Sep 2011 23:25:25 +0000 (16:25 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
Irfan Sheriff [Fri, 16 Sep 2011 23:06:53 +0000 (16:06 -0700)]
Merge "Update p2p settings UI"
Eric Fischer [Fri, 16 Sep 2011 22:37:26 +0000 (15:37 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ie7541f00b4b272d6ca840cde6286bcd5d6584ae4
Dianne Hackborn [Fri, 16 Sep 2011 20:52:39 +0000 (13:52 -0700)]
Merge "Fix issue #
5320747: Disabling an app that is an active device administrator..."
Dianne Hackborn [Fri, 16 Sep 2011 20:36:20 +0000 (13:36 -0700)]
Fix issue #
5320747: Disabling an app that is an active device administrator...
...can lead to an unsecure device
Now you can't disable device admins.
Or clear their data.
Or force stop them.
Or uninstall them (though the package manager also prevents uninstalling, might
as well disable this button along with everything else).
Change-Id: I69eefc2342e6f932908e9f5b87d3a601752810a4
Danielle Millett [Fri, 16 Sep 2011 19:41:30 +0000 (15:41 -0400)]
Adding info explaining facelock's backup lock
This changes the security picker when selecting a backup lock for facelock
such that it says back up lock and gives a brief description of why it's needed.
This is currently a temporary way to display the info and will need to be changed
for the final release.
Change-Id: I6373f97caec088482d36c65bd210c79238c623cf
Justin Ho [Fri, 16 Sep 2011 18:18:09 +0000 (11:18 -0700)]
am
a9efa2c2: Merge "Updated Settings Launcher icon Bug:
5286988" into ics-factoryrom
* commit '
a9efa2c2eafcd02a15138fc768b0492698e915fa':
Updated Settings Launcher icon Bug:
5286988
Justin Ho [Fri, 16 Sep 2011 18:16:41 +0000 (11:16 -0700)]
Merge "Updated Settings Launcher icon Bug:
5286988" into ics-factoryrom
Irfan Sheriff [Sat, 10 Sep 2011 00:06:05 +0000 (17:06 -0700)]
Update p2p settings UI
- Add self device information on settings
- Add remove group option
Bug:
5332330
Change-Id: I5de4fa1e92a5182e10269fe5c2b78f1f6313fb63
Justin Ho [Fri, 16 Sep 2011 15:52:17 +0000 (08:52 -0700)]
Updated Settings Launcher icon
Bug:
5286988
Change-Id: I9e1a2cf0c00d8f82451aea2edc7d47e8ce49aaf9
Irfan Sheriff [Fri, 16 Sep 2011 02:49:17 +0000 (19:49 -0700)]
Merge "Fix settings handling of wifi events"
Irfan Sheriff [Thu, 15 Sep 2011 21:45:25 +0000 (14:45 -0700)]
Fix settings handling of wifi events
When wifi events come out, settings has to change the switch state.
Changing switch state causes settings to also enable/disable wifi which
gets into a loop when there is a driver hung event.
Fix to only send framework calls when a user has changed the switch
settings
Bug:
5271322
Change-Id: I0a7d03a3fe0f28622de05981e5f72a9a8814b2d2
Svetoslav Ganov [Fri, 16 Sep 2011 01:48:55 +0000 (18:48 -0700)]
Merge "Enabled accessibility services settings may end with a separator." into ics-factoryrom
Svetoslav Ganov [Thu, 15 Sep 2011 22:26:52 +0000 (15:26 -0700)]
Enabled accessibility services settings may end with a separator.
SetupWizard was adding a separator after the last service name while
building the enabled accessibility services string. This case was not
handled by the settings. Added code to handle that case since it is
possible to have not well-formed settings backed up.
bug:
5098493
Change-Id: I8381872037611a7456ca31526c85effdb9949885
Robert Greenwalt [Thu, 15 Sep 2011 22:00:29 +0000 (15:00 -0700)]
Merge "Modify ApnEditor app for new APN schema." into ics-factoryrom
sinikang [Thu, 8 Sep 2011 22:44:09 +0000 (15:44 -0700)]
Modify ApnEditor app for new APN schema.
As the telephony db is changed, The ApnEditor app has to be changed also.
As your request, I changed the ListPreference object to read-only CheckBoxPreference object and "The Others" to "Unspecified".This is a pair set with below change-ids.
- https://partner.source.android.com/g/#/c/8515/
- https://partner.source.android.com/g/#/c/8517/
- https://partner.source.android.com/g/#/c/9048/
Change-Id: I2bdd4f3076adfbee0f277ddb59a150e51e45ac9b
bug:
4991683
Martijn Coenen [Wed, 14 Sep 2011 09:47:59 +0000 (11:47 +0200)]
Remove NFC sharing from Settings.
Bug:
5297151
Change-Id: I64304230296912519aa057a89f139a2242b557e3
Freeman Ng [Thu, 15 Sep 2011 02:11:49 +0000 (19:11 -0700)]
Merge "text changes requested by Legal"
Freeman Ng [Thu, 15 Sep 2011 01:17:28 +0000 (18:17 -0700)]
text changes requested by Legal
Change-Id: I7a967c75a20ad58fb45773a08122eae06a8f43c4
Svetoslav Ganov [Wed, 14 Sep 2011 23:44:55 +0000 (16:44 -0700)]
Merge "Minor string change according to UX spec"
Gilles Debunne [Wed, 14 Sep 2011 23:44:10 +0000 (16:44 -0700)]
Merge "Bug
5092721: Accounts & sync settings, auto sync in overflow menu."
Svetoslav Ganov [Wed, 14 Sep 2011 23:33:26 +0000 (16:33 -0700)]
Minor string change according to UX spec
Change-Id: Ia5745deb8221a58386e7775151d4b0a5d74b0005
Danielle Millett [Wed, 14 Sep 2011 23:11:37 +0000 (16:11 -0700)]
Merge "Fix
5316440: Fix for facelock setup asking to confirm password twice"
Svetoslav Ganov [Wed, 14 Sep 2011 20:35:39 +0000 (13:35 -0700)]
Merge "Polish of the accessibility settings."
Svetoslav Ganov [Wed, 14 Sep 2011 19:20:06 +0000 (12:20 -0700)]
Polish of the accessibility settings.
1. Some string changes according to updated UX specs.
2. Explore by touch now shown only if accessibility is on.
3. The one time dialog for installing TalkBack if no services
are installed was not showing.
bug:
5293099
bug:
5286578
Change-Id: I633999f798b16e2910d95d541a7c33d1a4f296b9
Danielle Millett [Wed, 14 Sep 2011 15:42:06 +0000 (11:42 -0400)]
Fix
5316440: Fix for facelock setup asking to confirm password twice
Change-Id: I6df292b80349a9d20b470d9261ecdca960b5dea5
Amith Yamasani [Wed, 14 Sep 2011 18:16:09 +0000 (11:16 -0700)]
Merge "Reduce string length for battery level and charging status."
Amith Yamasani [Wed, 14 Sep 2011 18:15:02 +0000 (11:15 -0700)]
Merge "Limit choice of font sizes to Small, Normal, Large and Extra Large."
Gilles Debunne [Fri, 9 Sep 2011 22:54:13 +0000 (15:54 -0700)]
Bug
5092721: Accounts & sync settings, auto sync in overflow menu.
Was usually "Make auto-sync an on/off switch in the action bar"
Changed to a check box in the overflow menu as per the comment in the bug.
Change-Id: I5a722ec1c743232c019fe89144a0a9463431747a
The Android Open Source Project [Wed, 14 Sep 2011 14:23:03 +0000 (07:23 -0700)]
Reconcile with gingerbread-mr4-release
Change-Id: Ib35a01f42fec2638707a34469b3a8187560a91f9
Jeff Sharkey [Wed, 14 Sep 2011 02:56:45 +0000 (19:56 -0700)]
Data usage: precise editing, restrict help, D-pad.
Introduce dialogs for precise editing of network policy warning/limit
values, triggered by click on sweep labels. Show up to 999MB before
rounding to GB, and round to nearest 5MB value when dragging. Partial
D-pad navigation around chart controls. Fix jumping when relayout
during drag, and fix sweep overlap bug.
When restricting data without limited networks, show dialog help to
guide user towards network limit. When reloading chart data, try
restoring to nearest cycle.
Bug:
5289641,
5111701,
5226078
Change-Id: Ic59dee6496c480a64dc56f8534acf4d81b50bca7
Irfan Sheriff [Fri, 9 Sep 2011 04:17:49 +0000 (21:17 -0700)]
Update new API in debug settings
Bug:
5247957
Change-Id: I594e55a928a2870cb153b042df74a2b354bee073
Amith Yamasani [Thu, 1 Sep 2011 22:22:29 +0000 (15:22 -0700)]
Limit choice of font sizes to Small, Normal, Large and Extra Large.
Bug:
5248351
Scales are 0.85x, 1.0x 1.15x and 1.3x
Change-Id: I784f64d7b0c52e1fd6b26ff4b4df7a9b23f23fe0
Amith Yamasani [Tue, 13 Sep 2011 20:40:27 +0000 (13:40 -0700)]
Reduce string length for battery level and charging status.
Bug:
5269660
Turn off suggestions and spell checking for Owner Info
Bug:
5281173
Change-Id: I7c4830e700bb52581504e222376cc912d2f345fc
Danielle Millett [Tue, 13 Sep 2011 17:57:49 +0000 (10:57 -0700)]
Merge "Fixed bug where facelock wasn't set correctly for pattern tutorial"
Danielle Millett [Tue, 13 Sep 2011 17:41:26 +0000 (13:41 -0400)]
Fixed bug where facelock wasn't set correctly for pattern tutorial
Change-Id: Id3c47cd2985c8565aec1255c0d08451443f7540c
Narayan Kamath [Tue, 13 Sep 2011 13:38:20 +0000 (14:38 +0100)]
Remove some unnecessary setLanguage() calls.
This prevents QUEUE_FLUSH from working as intented since
there is a (blocking) setLanguage() call that waits for
the previous synthesis to complete before flushing the queue.
bug:
5288327
Change-Id: I00467f0ac1584863ae27bfc076b8413e29e5379b
satok [Tue, 13 Sep 2011 05:46:56 +0000 (14:46 +0900)]
Tweak ime settings
Bug:
5282046
Change-Id: I8ef3913fc46c00288ac13fbc2a2d447efd531382
The Android Automerger [Tue, 13 Sep 2011 00:16:36 +0000 (17:16 -0700)]
keep history after reconcile of gingerbread-release
Jeff Sharkey [Mon, 12 Sep 2011 23:59:30 +0000 (16:59 -0700)]
Merge "Data usage performance, bugfixes."
Amith Yamasani [Mon, 12 Sep 2011 23:48:07 +0000 (16:48 -0700)]
Merge "Use a new config flag to decide if notification led pulsing can be turned on/off."
Jeff Brown [Mon, 12 Sep 2011 23:27:11 +0000 (16:27 -0700)]
Merge "Fix crash in APN settings. Bug:
4968921"
Jeff Sharkey [Mon, 12 Sep 2011 00:29:49 +0000 (17:29 -0700)]
Data usage performance, bugfixes.
Optimize launch times by removing unneeded extra work, including
reloading data and tightening chart invalidation. Fix invalidation
storm when sweeps overlap. Move chart history into loader instead of
blocking main thread.
Disable "Split 4G" mode until telephony support is ready, and combine
any existing split policies.
Async loading of application details. Remove alpha transitions to
speed up on some hardware. Hide menus in detail mode. Delay kicking
off force-poll. Fix inset padding on large devices.
Bug:
5284321,
5273918,
5263056
Change-Id: I746d79c05e2a6ea97bbdbdc5d807e208328d1373
Svetoslav Ganov [Mon, 12 Sep 2011 22:31:46 +0000 (15:31 -0700)]
Merge "Fixed tutorial to read instructions after hover events."
Ben Komalo [Mon, 12 Sep 2011 22:28:23 +0000 (15:28 -0700)]
Merge "Don't try to talk to vold mid-encryption."
Jeff Brown [Mon, 12 Sep 2011 21:59:51 +0000 (14:59 -0700)]
Fix crash in APN settings.
Bug:
4968921
Don't use managedQuery for one-shot queries.
Change-Id: I5d2e1bef0f399cb9dbe95d633c2ee014f6cd7f79
Amith Yamasani [Mon, 12 Sep 2011 21:11:56 +0000 (14:11 -0700)]
Use a new config flag to decide if notification led pulsing can be turned on/off.
Bug:
5242350
Change-Id: I6119abcfca01db4b937098a1a92233ba63f9cb29
Eric Fischer [Mon, 12 Sep 2011 17:17:15 +0000 (10:17 -0700)]
Merge "Import revised translations."
Eric Fischer [Mon, 12 Sep 2011 16:55:55 +0000 (09:55 -0700)]
Import revised translations.
Change-Id: I0c41c0ea09530226d1266e1a16641c8a962dc90b
satok [Mon, 12 Sep 2011 09:17:14 +0000 (18:17 +0900)]
Update the current IME label
Bug:
5069983
Change-Id: I84d6ac7c39b5f3a035aa04c35065280a14024c47
Ben Komalo [Thu, 8 Sep 2011 21:36:08 +0000 (14:36 -0700)]
Don't try to talk to vold mid-encryption.
We were attempting to unconditionally validate the encryption state on
CryptKeeper bringup, which required MountService to talk to vold. For
some reason, during encryption, this cannot happen, and that call never
returns, so the CryptKeeper UI was never brought up.
Bug:
5276690
Change-Id: I6a146e25e24f4efd760b0afa1e1409bf9ea3e9c3
Ben Komalo [Sun, 11 Sep 2011 23:48:32 +0000 (16:48 -0700)]
Merge "Force storage wipe if not removable and encrypted"
Justin Ho [Sat, 10 Sep 2011 00:27:05 +0000 (17:27 -0700)]
Merge "Updated Settings launcher icon Bug:
5286988"
Justin Ho [Fri, 9 Sep 2011 23:36:25 +0000 (16:36 -0700)]
Updated Settings launcher icon
Bug:
5286988
Change-Id: Iedd7b803c497a75b4b78589275cc16a5c7f32863
Peter Ng [Fri, 9 Sep 2011 20:38:50 +0000 (13:38 -0700)]
Merge "Power widget visual updates"
Ben Komalo [Wed, 7 Sep 2011 23:42:34 +0000 (16:42 -0700)]
Force storage wipe if not removable and encrypted
Bug:
5017638
Change-Id: I43c98359eff7202437249675060ba964e1bd085c
Jeff Sharkey [Fri, 9 Sep 2011 18:27:24 +0000 (11:27 -0700)]
Merge "Larger touch targets, snap to persisted value."
Justin Ho [Fri, 9 Sep 2011 18:01:51 +0000 (11:01 -0700)]
Merge "Updated PowerWidget dimens Bug:
5278970"
Peter Ng [Thu, 8 Sep 2011 22:15:54 +0000 (15:15 -0700)]
Power widget visual updates
-light spill added
-padding top to make up for new shadow and light spill
Change-Id: I5d6bee6efd58736a812b9c3d144b8735d30865f5
Gilles Debunne [Fri, 9 Sep 2011 16:47:29 +0000 (09:47 -0700)]
Merge "Bug
5042999: Wi-Fi disconnect policy strings"
Jean-Baptiste Queru [Fri, 9 Sep 2011 12:45:05 +0000 (05:45 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release
Change-Id: I6e271c4fbcb138e695fb21c268df7d83efb5484f
Jim Miller [Sat, 3 Sep 2011 00:33:53 +0000 (17:33 -0700)]
Fix
5185505: Add weak biometric sensors to security choices.
This adds a simple biometric sensor (face lock) to the security choices.
Updated to disable biometric sensor by default.
Change-Id: I088e5e99cf5f8c7a06a1a992a9257940eb2cc07f
Jeff Sharkey [Fri, 9 Sep 2011 01:57:17 +0000 (18:57 -0700)]
Larger touch targets, snap to persisted value.
Extend ListView content to screen edges, and use InsetBoundsDrawable
to draw separator and divider with expected padding. Sweep touch
targets are now much larger.
Snap sweep to persisted value, and fix NFE when parsing label value.
Bug:
5274249
Bug:
5262865
Bug:
5242857
Change-Id: Ifa0f3e622767d5b4dc85a73d6340207e6038a429
Gilles Debunne [Thu, 8 Sep 2011 23:51:39 +0000 (16:51 -0700)]
Bug
5042999: Wi-Fi disconnect policy strings
Changed string.
Preference's summary now displays the currently selected value.
Change-Id: I5d867bb149c247809c6794f57d91dbebd96392f4
Justin Ho [Thu, 8 Sep 2011 23:22:38 +0000 (16:22 -0700)]
Updated PowerWidget dimens
Bug:
5278970
Change-Id: I70386349ac47cc58230c1ec0d18220e7af99a6e6
Amith Yamasani [Thu, 8 Sep 2011 22:23:27 +0000 (15:23 -0700)]
Merge "Move notification LED setting down to SYSTEM section."
Amith Yamasani [Thu, 8 Sep 2011 00:15:03 +0000 (17:15 -0700)]
Move notification LED setting down to SYSTEM section.
Bug:
5242350
Change-Id: I4dbefc4e7ba5a19e873c00ba1da84e7a900226cf
Claudia de Veaux [Thu, 8 Sep 2011 17:41:37 +0000 (10:41 -0700)]
Merge "Shortened the "Restrict background data" string so it won't trucate. Bug:
5255012"
Dianne Hackborn [Thu, 8 Sep 2011 01:33:26 +0000 (18:33 -0700)]
Fix an issue in how running services are shown.
If a process had started services, but another process was
using it for more important reasons, it would still be shown
as just with running services. Now it will be bundled into
the other process that has a dependency on this.
This fixes an issue where something like a live wallpaper
that say sits forever with a connection to market's licensing
service would not show up to the user as using far more memory
than it should because it is keeping market running (if market
also leaves one of its services running, which it tends to do).
Change-Id: I0fd953b7221f7a3b35400007bb9e8437f09d066e
Jaikumar Ganesh [Thu, 8 Sep 2011 01:22:35 +0000 (18:22 -0700)]
Merge "Enforce permissions for connection dialog intents."
Jaikumar Ganesh [Thu, 8 Sep 2011 00:19:19 +0000 (17:19 -0700)]
Enforce permissions for connection dialog intents.
Change-Id: I93bcf676f4bd11737f22f0b89cfe49c978a42c8e
Irfan Sheriff [Thu, 8 Sep 2011 00:07:58 +0000 (17:07 -0700)]
Merge "Use hasSystemFeature() to check for p2p"
Ben Komalo [Wed, 7 Sep 2011 22:29:49 +0000 (15:29 -0700)]
Merge "Show factory reset option if encryption went bad."
Jake Hamby [Wed, 7 Sep 2011 21:56:43 +0000 (14:56 -0700)]
Merge "BT device picker: don't rescan after rotating the device"