diff options
| author | Michael W <baddaemon87@gmail.com> | 2020-07-09 22:28:19 +0200 |
|---|---|---|
| committer | doc HD <doc.divxm@gmail.com> | 2020-07-19 13:36:40 +0300 |
| commit | 0bda19ec98c8c15110e8c6b13158ff3dcb168ac6 (patch) | |
| tree | 30c85b7975eb1bfd0fd0889a41658ad6228033bc | |
| parent | 0b5810276d3043d2bf1429e89efe04647fecbb4c (diff) | |
DeskClock: Don't rely on framework
* Building within an AOSP environment sets sdk_version: "current"
which makes the build fail here due to usage of "com.android.internal"
stuff
* Set local ids instead where required and use PreferenceImageView
from androidx instead of com.android.internal
Change-Id: I5b50531720840ae81559c8fd958166154098b782
| -rw-r--r-- | res/layout/alarm_volume_preference.xml | 4 | ||||
| -rw-r--r-- | src/com/android/deskclock/settings/AlarmVolumePreference.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/res/layout/alarm_volume_preference.xml b/res/layout/alarm_volume_preference.xml index c67fb6a63..e8e969f20 100644 --- a/res/layout/alarm_volume_preference.xml +++ b/res/layout/alarm_volume_preference.xml @@ -35,7 +35,7 @@ android:paddingEnd="12dp" android:paddingTop="4dp" android:paddingBottom="4dp"> - <com.android.internal.widget.PreferenceImageView + <androidx.preference.internal.PreferenceImageView android:id="@android:id/icon" android:layout_width="24dp" android:layout_height="24dp"/> @@ -70,7 +70,7 @@ android:orientation="vertical"> <SeekBar - android:id="@*android:id/seekbar" + android:id="@+id/seekbar" android:layout_gravity="center_vertical" android:paddingStart="12dp" android:layout_width="match_parent" diff --git a/src/com/android/deskclock/settings/AlarmVolumePreference.java b/src/com/android/deskclock/settings/AlarmVolumePreference.java index cfb28cc1c..c6510db1a 100644 --- a/src/com/android/deskclock/settings/AlarmVolumePreference.java +++ b/src/com/android/deskclock/settings/AlarmVolumePreference.java @@ -61,10 +61,10 @@ public class AlarmVolumePreference extends Preference { // Disable click feedback for this preference. holder.itemView.setClickable(false); - mSeekbar = (SeekBar) holder.findViewById(com.android.internal.R.id.seekbar); + mSeekbar = (SeekBar) holder.findViewById(R.id.seekbar); mSeekbar.setMax(audioManager.getStreamMaxVolume(STREAM_ALARM)); mSeekbar.setProgress(audioManager.getStreamVolume(STREAM_ALARM)); - mAlarmIcon = (ImageView) holder.findViewById(com.android.internal.R.id.icon); + mAlarmIcon = (ImageView) holder.findViewById(android.R.id.icon); onSeekbarChanged(); |