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

Commit 9aacd50c authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "Fix issue #7242119 and #7242008." into jb-mr1-dev

parents e00d33cf 3244e960

core/res/res/drawable-hdpi/ic_coins_s.png

0 → 100644
+1.07 KiB
Loading image diff...

core/res/res/drawable-mdpi/ic_coins_s.png

0 → 100644
+741 B
Loading image diff...

core/res/res/drawable-xhdpi/ic_coins_s.png

0 → 100644
+1.45 KiB
Loading image diff...

core/res/res/layout/app_permission_item_money.xml

+5 −2
Original line number Original line Diff line number Diff line
@@ -55,9 +55,11 @@ 
            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentStart="true"

            android:layout_alignParentStart="true"

            android:layout_below="@id/perm_name"

            android:layout_alignBottom="@+id/perm_money_label"

            android:scaleType="fitCenter" />

            android:scaleType="fitCenter"

            android:src="@android:drawable/ic_coins_s" />

        <TextView

        <TextView

            android:id="@+id/perm_money_label"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:textSize="16sp"

            android:textSize="16sp"

            android:textColor="@color/perms_costs_money"

            android:textColor="@color/perms_costs_money"
@@ -65,6 +67,7 @@ 
            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toEndOf="@id/perm_money_icon"

            android:layout_toEndOf="@id/perm_money_icon"

            android:layout_below="@id/perm_name"

            android:layout_below="@id/perm_name"

            android:layout_marginStart="8dp"

            android:text="@string/perm_costs_money" />

            android:text="@string/perm_costs_money" />

    </RelativeLayout>

    </RelativeLayout>

core/res/res/values/colors.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -90,7 +90,7 @@ 
    <color name="perms_dangerous_grp_color">#33b5e5</color>

    <color name="perms_dangerous_grp_color">#33b5e5</color>

    <color name="perms_dangerous_perm_color">#33b5e5</color>

    <color name="perms_dangerous_perm_color">#33b5e5</color>

    <color name="shadow">#cc222222</color>

    <color name="shadow">#cc222222</color>

    <color name="perms_costs_money">#ffffb060</color>

    <color name="perms_costs_money">#ffffbb33</color>

    

    

    <!-- For search-related UIs -->

    <!-- For search-related UIs -->

    <color name="search_url_text_normal">#7fa87f</color>

    <color name="search_url_text_normal">#7fa87f</color>