diff options
author | Diogo Ferreira <defer@cyngn.com> | 2014-12-02 14:47:33 +0000 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-03-14 23:47:22 -0700 |
commit | 4015b125b647875a8a8d8e204c52157be4124e34 (patch) | |
tree | a6393ffcb8594310770f6d0ec1a2f4c747d763d4 /src | |
parent | f8727c0f413ebb9cd94f31145956601fe7bded3d (diff) | |
download | android_packages_apps_Bluetooth-4015b125b647875a8a8d8e204c52157be4124e34.tar.gz android_packages_apps_Bluetooth-4015b125b647875a8a8d8e204c52157be4124e34.tar.bz2 android_packages_apps_Bluetooth-4015b125b647875a8a8d8e204c52157be4124e34.zip |
bluetooth: Materialize dialogs
Some dialogs imported from CAF are still using a Holo style, this
patch changes those to material and changes some layouts for better
usability:
1) Changes the enable dialog when something is shared via BT and it is off.
2) Changes the enabling progress dialog.
3) Removes a Toast (visible in screenshots)
4) Sets a transparent theme on the intent receiver, it's only a forwarding
activity but it is up for enough time and shows a ugly incomplete view
that immediately disappears.
Change-Id: Ia3f64f7d22a6486565df3035d22883e8d216dbe0
Diffstat (limited to 'src')
5 files changed, 6 insertions, 6 deletions
diff --git a/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java b/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java index c407ce066..59f925c98 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java +++ b/src/com/android/bluetooth/opp/BluetoothOppBtEnableActivity.java @@ -56,6 +56,7 @@ public class BluetoothOppBtEnableActivity extends AlertActivity implements @Override protected void onCreate(Bundle savedInstanceState) { + setTheme(R.style.Theme_Material_Settings_Floating); super.onCreate(savedInstanceState); // Set up the "dialog" @@ -75,8 +76,7 @@ public class BluetoothOppBtEnableActivity extends AlertActivity implements private View createView() { View view = getLayoutInflater().inflate(R.layout.confirm_dialog, null); TextView contentView = (TextView)view.findViewById(R.id.content); - contentView.setText(getString(R.string.bt_enable_line1) + "\n\n" - + getString(R.string.bt_enable_line2) + "\n"); + contentView.setText(getString(R.string.bt_enable_line2)); return view; } @@ -88,9 +88,6 @@ public class BluetoothOppBtEnableActivity extends AlertActivity implements mOppManager.mSendingFlag = true; mBtEnabled = true; - Toast.makeText(this, getString(R.string.enabling_progress_content), - Toast.LENGTH_SHORT).show(); - Intent in = new Intent(this, BluetoothOppBtEnablingActivity.class); in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); this.startActivity(in); diff --git a/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java b/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java index 12f5d4ecd..be661a45f 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java +++ b/src/com/android/bluetooth/opp/BluetoothOppBtEnablingActivity.java @@ -67,6 +67,7 @@ public class BluetoothOppBtEnablingActivity extends AlertActivity { @Override protected void onCreate(Bundle savedInstanceState) { + setTheme(R.style.Theme_Material_Settings_Floating); super.onCreate(savedInstanceState); // If BT is already enabled jus return. @@ -82,7 +83,6 @@ public class BluetoothOppBtEnablingActivity extends AlertActivity { // Set up the "dialog" final AlertController.AlertParams p = mAlertParams; - p.mTitle = getString(R.string.enabling_progress_title); p.mView = createView(); setupAlert(); diff --git a/src/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java b/src/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java index d2380f661..ee98247b1 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java +++ b/src/com/android/bluetooth/opp/BluetoothOppBtErrorActivity.java @@ -53,6 +53,7 @@ public class BluetoothOppBtErrorActivity extends AlertActivity implements @Override protected void onCreate(Bundle savedInstanceState) { + setTheme(R.style.Theme_Material_Settings_Floating); super.onCreate(savedInstanceState); Intent intent = getIntent(); diff --git a/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java b/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java index 86ca18da8..4aa57f977 100644 --- a/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java +++ b/src/com/android/bluetooth/opp/BluetoothOppTransferActivity.java @@ -134,6 +134,7 @@ public class BluetoothOppTransferActivity extends AlertActivity implements @Override protected void onCreate(Bundle savedInstanceState) { + setTheme(R.style.Theme_Material_Settings_Floating); super.onCreate(savedInstanceState); Intent intent = getIntent(); mUri = intent.getData(); diff --git a/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java b/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java index 202c7d7a5..9dd9fb7f4 100644 --- a/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java +++ b/src/com/android/bluetooth/pbap/BluetoothPbapActivity.java @@ -109,6 +109,7 @@ public class BluetoothPbapActivity extends AlertActivity implements @Override protected void onCreate(Bundle savedInstanceState) { + setTheme(R.style.Theme_Material_Settings_Floating); super.onCreate(savedInstanceState); Intent i = getIntent(); String action = i.getAction(); |