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

Commit 2369e050 authored by Michael W's avatar Michael W
Browse files

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
parent 1b3d30e5

res/layout/alarm_volume_preference.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"

src/com/android/deskclock/settings/AlarmVolumePreference.java

+2 −2
Original line number Diff line number Diff line
@@ -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();