diff options
| author | wjiang <wjiang@codeaurora.org> | 2014-04-30 13:06:08 +0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-08-25 20:04:14 +0000 |
| commit | ff44b7ac5d3b8550b316b24be6ec336e2a92cb1b (patch) | |
| tree | 491cd3b55ad7fb9fb69b6a40bc971385764ad3d1 | |
| parent | 1aceb755fce6f06356251207d7db7be28cbdca2a (diff) | |
| download | android_packages_apps_DeskClock-ff44b7ac5d3b8550b316b24be6ec336e2a92cb1b.tar.gz android_packages_apps_DeskClock-ff44b7ac5d3b8550b316b24be6ec336e2a92cb1b.tar.bz2 android_packages_apps_DeskClock-ff44b7ac5d3b8550b316b24be6ec336e2a92cb1b.zip | |
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
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/deskclock/AlarmClockFragment.java | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e0dc26732..4194a2005 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -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" diff --git a/src/com/android/deskclock/AlarmClockFragment.java b/src/com/android/deskclock/AlarmClockFragment.java index 0cefe6088..db40438b6 100644 --- a/src/com/android/deskclock/AlarmClockFragment.java +++ b/src/com/android/deskclock/AlarmClockFragment.java @@ -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 |