Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c015a1ba authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Fix BandMode Dialog Crash on Open due to Style" am: 7588ef15 

am: 7aacdc2c

Change-Id: I50588e17f07d89daa3a989a72080a4fe695b4729
parents a7c88692 7aacdc2c

AndroidManifest.xml

+1 −2
Original line number Diff line number Diff line
@@ -2170,9 +2170,8 @@ 
            </intent-filter>

        </activity>



        <!-- TODO: Is this needed? -->

        <activity android:name="BandMode"

                  android:theme="@android:style/Theme.DeviceDefault.Light.Dialog.Alert"

                  android:label="@string/band_mode_title"

                  android:process="com.android.phone">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

res/layout/band_mode.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
              android:padding="4dip"

              android:gravity="center_horizontal"

              android:layout_width="match_parent"

              android:layout_height="match_parent">

              android:layout_height="wrap_content">



    <ListView android:id="@+id/band"

              android:layout_width="match_parent"

src/com/android/settings/BandMode.java

+0 −5
Original line number Diff line number Diff line
@@ -73,13 +73,8 @@ public class BandMode extends Activity { 
        super.onCreate(icicle);



        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);



        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();



        mBandList = (ListView) findViewById(R.id.band);