Made Bluetooth device dialog fully scrollable.

+ Also updated padding around Available Devices.
+ Also updated opacity on Bluetooth's "your device is visible" message.

Bug: 17398966
Change-Id: Id9631334ee0f3a01e40b00470d6debf6a31abe47
This commit is contained in:
PauloftheWest
2014-09-10 10:29:19 -07:00
parent 574db42695
commit 26747b9da0
4 changed files with 14 additions and 27 deletions

View File

@@ -20,35 +20,9 @@
android:orientation="vertical" android:orientation="vertical"
android:gravity="center"> android:gravity="center">
<LinearLayout android:id="@+id/dialog_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="@dimen/bluetooth_dialog_padding"
style="@style/bt_item" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/bluetooth_preference_paired_dialog_name_label"
android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary"
android:textDirection="locale"
style="@style/bt_item_label" />
<EditText android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:maxLength="@integer/bluetooth_name_length"
android:singleLine="true"
style="@style/bt_item_edit_content" />
<fragment android:id="@+id/bluetooth_fragment_settings" <fragment android:id="@+id/bluetooth_fragment_settings"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
class="com.android.settings.bluetooth.DeviceProfilesSettings" /> class="com.android.settings.bluetooth.DeviceProfilesSettings" />
</LinearLayout>
</LinearLayout> </LinearLayout>

View File

@@ -22,4 +22,5 @@
android:textAppearance="@android:style/TextAppearance.Material.Body1" android:textAppearance="@android:style/TextAppearance.Material.Body1"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:paddingTop="16dip" android:paddingTop="16dip"
android:paddingStart="16dip"
android:paddingBottom="16dip" /> android:paddingBottom="16dip" />

View File

@@ -31,6 +31,7 @@
android:background="@null" android:background="@null"
android:id="@+android:id/title" android:id="@+android:id/title"
android:paddingStart="0dp" android:paddingStart="0dp"
android:paddingTop="6dp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
@@ -40,6 +41,7 @@
<ProgressBar <ProgressBar
android:id="@+id/scanning_progress" android:id="@+id/scanning_progress"
android:text="@string/progress_scanning" android:text="@string/progress_scanning"
android:paddingTop="6dp"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"

View File

@@ -44,6 +44,7 @@ import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
@@ -322,7 +323,6 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
mMyDevicePreference.setSummary(getResources().getString( mMyDevicePreference.setSummary(getResources().getString(
R.string.bluetooth_is_visible_message, mLocalAdapter.getName())); R.string.bluetooth_is_visible_message, mLocalAdapter.getName()));
mMyDevicePreference.setSelectable(false); mMyDevicePreference.setSelectable(false);
mMyDevicePreference.setEnabled(false);
preferenceScreen.addPreference(mMyDevicePreference); preferenceScreen.addPreference(mMyDevicePreference);
getActivity().invalidateOptionsMenu(); getActivity().invalidateOptionsMenu();
@@ -401,11 +401,17 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
parent.removeView(mSettingsDialogView); parent.removeView(mSettingsDialogView);
} }
} }
if (profileFrag == null) { if (profileFrag == null) {
LayoutInflater inflater = getActivity().getLayoutInflater(); LayoutInflater inflater = getActivity().getLayoutInflater();
mSettingsDialogView = inflater.inflate(R.layout.bluetooth_device_settings, null); mSettingsDialogView = inflater.inflate(R.layout.bluetooth_device_settings, null);
profileFrag = (DeviceProfilesSettings)activity.getFragmentManager() profileFrag = (DeviceProfilesSettings)activity.getFragmentManager()
.findFragmentById(R.id.bluetooth_fragment_settings); .findFragmentById(R.id.bluetooth_fragment_settings);
// To enable scrolling we store the name field in a seperate header and add to
// the ListView of the profileFrag.
View header = inflater.inflate(R.layout.bluetooth_device_settings_header, null);
profileFrag.getListView().addHeaderView(header);
} }
final View dialogLayout = mSettingsDialogView; final View dialogLayout = mSettingsDialogView;
@@ -439,6 +445,10 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
AlertDialog dialog = settingsDialog.create(); AlertDialog dialog = settingsDialog.create();
dialog.create(); dialog.create();
dialog.show(); dialog.show();
// We must ensure that clicking on the EditText will bring up the keyboard.
dialog.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
| WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
} }
}; };