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

Commit c1405d9a authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge branch '5427-widget_slider_color' into 'master'

Change widget size slider accent color

See merge request !92
parents 4d01a341 c13b2b63
Loading
Loading
Loading
Loading
Loading
+4 −5
Original line number Diff line number Diff line
@@ -3282,9 +3282,8 @@ public class LauncherActivity extends AppCompatActivity implements
            });

            AnimatorSet set = new AnimatorSet();
            set.play(ObjectAnimator.ofFloat(widgetResizeContainer, View.Y,
                    mDeviceProfile.availableHeightPx,
                    mDeviceProfile.availableHeightPx - Utilities.pxFromDp(48, this)));
            set.play(ObjectAnimator.ofFloat(widgetResizeContainer, View.TRANSLATION_Y,
                    Utilities.pxFromDp(48, this), 0));
            set.setDuration(200);
            set.setInterpolator(new LinearInterpolator());
            set.addListener(new AnimatorListenerAdapter() {
@@ -3368,8 +3367,8 @@ public class LauncherActivity extends AppCompatActivity implements
                currentAnimator.cancel();
            }
            AnimatorSet set = new AnimatorSet();
            set.play(ObjectAnimator.ofFloat(widgetResizeContainer, View.Y,
                    mDeviceProfile.availableHeightPx));
            set.play(ObjectAnimator.ofFloat(widgetResizeContainer, View.TRANSLATION_Y,
                    Utilities.pxFromDp(48, this)));
            set.setDuration(200);
            set.setInterpolator(new LinearInterpolator());
            set.addListener(new AnimatorListenerAdapter() {
+3 −1
Original line number Diff line number Diff line
@@ -94,7 +94,9 @@
            android:layout_marginLeft="8dp"
            android:layout_marginRight="8dp"
            android:layout_toLeftOf="@id/max_label"
            android:layout_toEndOf="@id/min_label" />
            android:layout_toEndOf="@id/min_label"
            android:thumbTint="@color/accent_color"
            android:progressTint="@color/accent_color" />

        <TextView
            android:id="@+id/max_label"
+1 −0
Original line number Diff line number Diff line
@@ -33,4 +33,5 @@
    <color name="folder_preview_background_color">#4dcbcbcb</color>
    <color name="dock_background_color">#26ffffff</color>

    <color name="accent_color">#0086FF</color>
</resources>