Merge "Fix BandMode Dialog Crash on Open due to Style" am: 7588ef1518 am: 7aacdc2c13

am: c015a1bac0

Change-Id: I5d1f931b9b5a6dae87d4effd20ec91d6f9114989
This commit is contained in:
Nathan Harold
2019-01-07 17:50:20 -08:00
committed by android-build-merger
3 changed files with 2 additions and 8 deletions

View File

@@ -2007,9 +2007,8 @@
</intent-filter> </intent-filter>
</activity> </activity>
<!-- TODO: Is this needed? -->
<activity android:name="BandMode" <activity android:name="BandMode"
android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert" android:label="@string/band_mode_title"
android:process="com.android.phone"> android:process="com.android.phone">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />

View File

@@ -19,7 +19,7 @@
android:padding="4dip" android:padding="4dip"
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content">
<ListView android:id="@+id/band" <ListView android:id="@+id/band"
android:layout_width="match_parent" android:layout_width="match_parent"

View File

@@ -73,13 +73,8 @@ public class BandMode extends Activity {
super.onCreate(icicle); super.onCreate(icicle);
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
setContentView(R.layout.band_mode); setContentView(R.layout.band_mode);
setTitle(getString(R.string.band_mode_title));
getWindow().setLayout(WindowManager.LayoutParams.MATCH_PARENT,
WindowManager.LayoutParams.WRAP_CONTENT);
mPhone = PhoneFactory.getDefaultPhone(); mPhone = PhoneFactory.getDefaultPhone();
mBandList = (ListView) findViewById(R.id.band); mBandList = (ListView) findViewById(R.id.band);