Adopt android.support.preference-v14 library (c52298dd) · Commits · e / os / android_packages_apps_DeskClock

Android.mk

+8 −0

Original line number	Diff line number	Diff line
		@@ -6,13 +6,17 @@ LOCAL_RESOURCE_DIR += frameworks/opt/datetimepicker/res

		ifeq ($(TARGET_BUILD_APPS),)
		LOCAL_RESOURCE_DIR += frameworks/support/design/res
		LOCAL_RESOURCE_DIR += frameworks/support/v14/preference/res
		LOCAL_RESOURCE_DIR += frameworks/support/v7/appcompat/res
		LOCAL_RESOURCE_DIR += frameworks/support/v7/gridlayout/res
		LOCAL_RESOURCE_DIR += frameworks/support/v7/preference/res
		LOCAL_RESOURCE_DIR += frameworks/support/v7/recyclerview/res
		else
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/design/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v14/preference/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/appcompat/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/gridlayout/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/preference/res
		LOCAL_RESOURCE_DIR += prebuilts/sdk/current/support/v7/recyclerview/res
		endif

		@@ -28,14 +32,18 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-opt-datetimepicker
		LOCAL_STATIC_JAVA_LIBRARIES += messageformat
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-design
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v14-preference
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-gridlayout
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-preference
		LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-recyclerview

		LOCAL_AAPT_FLAGS := --auto-add-overlay
		LOCAL_AAPT_FLAGS += --extra-packages android.support.design
		LOCAL_AAPT_FLAGS += --extra-packages android.support.v14.preference
		LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.appcompat
		LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.gridlayout
		LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.preference
		LOCAL_AAPT_FLAGS += --extra-packages android.support.v7.recyclerview
		LOCAL_AAPT_FLAGS += --extra-packages com.android.datetimepicker
		LOCAL_AAPT_FLAGS += --extra-packages com.android.messageformat

res/layout/settings.xml

+2 −9

Original line number	Diff line number	Diff line
		@@ -15,14 +15,7 @@
		-->

		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:fitsSystemWindows="true">

		<fragment
		android:id="@+id/main"
		android:name="com.android.deskclock.settings.SettingsActivity$PrefsFragment"
		android:layout_width="match_parent"
		android:layout_height="match_parent" />

		</FrameLayout>
		android:layout_height="match_parent"
		android:fitsSystemWindows="true" />

res/values-v21/styles.xml

+0 −16

Original line number	Diff line number	Diff line
		@@ -16,22 +16,6 @@

		<resources>

		<style name="SettingsTheme" parent="TranslucentDecorActivityTheme">
		<item name="android:alertDialogTheme">@style/SettingsAlertDialogTheme</item>
		<item name="android:detailsElementBackground">@null</item>

		<!-- Attributes from support.v7.appcompat -->
		<item name="actionBarStyle">@style/SettingsActionBarStyle</item>
		<item name="colorControlActivated">?attr/colorAccent</item>
		<item name="windowActionBar">true</item>
		<item name="windowNoTitle">false</item>
		</style>

		<!-- Theme that will be used by PreferenceFragment (i.e. not AppCompat). -->
		<style name="SettingsAlertDialogTheme" parent="android:Theme.Material.Dialog.Alert">
		<item name="android:colorAccent">?attr/colorAccent</item>
		</style>

		<!-- Custom notification content styles -->
		<!-- copied TextAppearance.Material.Button -->
		<style name="TextAppearance.StatusBar.EventContent.Action">

res/values/styles.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -73,10 +73,18 @@
		<item name="android:detailsElementBackground">@null</item>
		<!-- Attributes from support.v7.appcompat -->
		<item name="actionBarStyle">@style/SettingsActionBarStyle</item>
		<item name="alertDialogTheme">@style/SettingsAlertDialogTheme</item>
		<item name="colorControlActivated">?attr/colorAccent</item>
		<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
		<item name="windowActionBar">true</item>
		<item name="windowNoTitle">false</item>
		</style>

		<!-- Theme that will be used by PreferenceFragment. -->
		<style name="SettingsAlertDialogTheme" parent="Theme.AppCompat.Dialog.Alert">
		<item name="colorAccent">@color/color_accent</item>
		</style>

		<style name="SettingsActionBarStyle" parent="@style/Widget.AppCompat.Toolbar">
		<item name="android:background">@null</item>

res/xml/settings.xml

+6 −9

Original line number	Diff line number	Diff line
		@@ -53,19 +53,17 @@
		android:defaultValue="10"
		android:dialogTitle="@string/auto_silence_title" />

		<com.android.deskclock.settings.SnoozeLengthDialog
		<com.android.deskclock.settings.SnoozeLengthDialogPreference
		android:key="snooze_duration"
		android:title="@string/snooze_duration_title"
		android:defaultValue="10"/>
		android:title="@string/snooze_duration_title" />

		<Preference
		android:key="volume_setting"
		android:title="@string/alarm_volume_title" />

		<com.android.deskclock.settings.CrescendoLengthDialog
		<com.android.deskclock.settings.CrescendoLengthDialogPreference
		android:key="alarm_crescendo_duration"
		android:title="@string/crescendo_duration_title"
		android:defaultValue="0"/>
		android:title="@string/crescendo_duration_title" />

		<ListPreference
		android:key="volume_button_setting"
		@@ -89,10 +87,9 @@
		android:key="timer_ringtone"
		android:title="@string/timer_ringtone_title" />

		<com.android.deskclock.settings.CrescendoLengthDialog
		<com.android.deskclock.settings.CrescendoLengthDialogPreference
		android:key="timer_crescendo_duration"
		android:title="@string/crescendo_duration_title"
		android:defaultValue="0"/>
		android:title="@string/crescendo_duration_title" />
		</PreferenceCategory>

		</PreferenceScreen>