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

Commit ff44b7ac authored by wjiang's avatar wjiang Committed by Brint E. Kriebel
Browse files

DeskClock: Avoid DeskClock layout displays abnormally on landscape. 

- ConfigChanges property for DeskClock activity won't let the activity
recreate and re-layout when rotating the device.
- Delete the activity property. Meanwhile, when the activity recreate
it will reset music seletion source to be zero which lead to the music
picker uri null. Save and restore the seletion before re-createing.

Change-Id: If680f0b262231cf3b8b7186c9dbacea7c0d1574e
CRs-Fixed: 655098
parent 1aceb755

AndroidManifest.xml

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
                android:writePermission="com.android.deskclock.worldclock.permissions.WRITE_DATABASE" />



        <activity android:name="DeskClock"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:label="@string/app_label"

                android:theme="@style/DeskClock"

                android:icon="@mipmap/ic_launcher_alarmclock"

src/com/android/deskclock/AlarmClockFragment.java

+3 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ public class AlarmClockFragment extends DeskClockFragment implements 
    private static final String KEY_PREVIOUS_DAY_MAP = "previousDayMap";

    private static final String KEY_SELECTED_ALARM = "selectedAlarm";

    private static final String KEY_DELETE_CONFIRMATION = "deleteConfirmation";

    private static final String KEY_SELECT_SOURCE = "selectedSource";



    private static final int REQUEST_CODE_RINGTONE = 1;

    private static final int REQUEST_CODE_PROFILE = 2;
@@ -214,6 +215,7 @@ public class AlarmClockFragment extends DeskClockFragment implements 
            selectedAlarms = savedState.getLongArray(KEY_SELECTED_ALARMS);

            previousDayMap = savedState.getBundle(KEY_PREVIOUS_DAY_MAP);

            mSelectedAlarm = savedState.getParcelable(KEY_SELECTED_ALARM);

            mSelectSource = savedState.getInt(KEY_SELECT_SOURCE);

        }



        // Register profiles status
@@ -592,6 +594,7 @@ public class AlarmClockFragment extends DeskClockFragment implements 
        outState.putBoolean(KEY_UNDO_SHOWING, mUndoShowing);

        outState.putBundle(KEY_PREVIOUS_DAY_MAP, mAdapter.getPreviousDaysOfWeekMap());

        outState.putParcelable(KEY_SELECTED_ALARM, mSelectedAlarm);

        outState.putInt(KEY_SELECT_SOURCE, mSelectSource);

    }



    @Override