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

Commit 254e8aea authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Update for shortcuts" into mnc-dev

parents 610413d3 78b1715b

res/drawable-xxxhdpi/shortcut_base.png

+1.23 KiB (9.74 KiB)
Loading image diff...

res/layout/shortcut_badge.xml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
        android:id="@android:id/icon"

        android:layout_width="@dimen/shortcut_size"

        android:layout_height="@dimen/shortcut_size"

        android:tint="@color/icon_accent"

        android:padding="12dp"

        android:scaleType="fitXY" />

res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -100,4 +100,7 @@ 


    <color name="zen_rule_name_warning">@color/system_warning_color</color>



    <!-- Accent color that matches the settings launcher icon -->

    <color name="icon_accent">#ffabffec</color>



</resources>

src/com/android/settings/CreateShortcut.java

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class CreateShortcut extends LauncherActivity { 
    }



    private Bitmap createIcon(int resource) {

        Context context = new ContextThemeWrapper(this, android.R.style.Theme_Material_Light);

        Context context = new ContextThemeWrapper(this, android.R.style.Theme_Material);

        View view = LayoutInflater.from(context).inflate(R.layout.shortcut_badge, null);

        ((ImageView) view.findViewById(android.R.id.icon)).setImageResource(resource);