am 81fafc51: am db99ad93: Merge "Bluetooth Device picker will now scan for devices." into lmp-dev

* commit '81fafc5143cf41764c7286b48824f50cc0d957fc':
  Bluetooth Device picker will now scan for devices.
This commit is contained in:
PauloftheWest
2014-08-27 21:36:58 +00:00
committed by Android Git Automerger

View File

@@ -35,7 +35,7 @@
style="@style/wifi_item_label" />
<EditText android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:maxLength="@integer/bluetooth_name_length"
@@ -45,7 +45,7 @@
<fragment android:id="@+id/bluetooth_fragment_settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
class="com.android.settings.bluetooth.DeviceProfilesSettings" />
class="com.android.settings.bluetooth.DevicePickerFragment" />
</LinearLayout>