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

Commit 08067b18 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Properly define info button in App Permissions" into pi-dev

parents 61b4e5e1 41a70266

res/drawable/ic_info_outline.xml

+2 −6
Original line number Diff line number Diff line
@@ -17,12 +17,8 @@ Copyright (C) 2015 The Android Open Source Project 
        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

        android:viewportHeight="24.0">

    <path

        android:pathData="M0 0h24v24H0z"

        android:fillColor="#00000000"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:fillColor="?android:attr/colorAccent"

        android:pathData="M11.0,17.0l2.0,0.0l0.0,-6.0l-2.0,0.0l0.0,6.0zm1.0,-15.0C6.48,2.0 2.0,6.48 2.0,12.0s4.48,10.0 10.0,10.0 10.0,-4.48 10.0,-10.0S17.52,2.0 12.0,2.0zm0.0,18.0c-4.41,0.0 -8.0,-3.59 -8.0,-8.0s3.59,-8.0 8.0,-8.0 8.0,3.59 8.0,8.0 -3.59,8.0 -8.0,8.0zM11.0,9.0l2.0,0.0L13.0,7.0l-2.0,0.0l0.0,2.0z"/>

</vector>

res/layout/header.xml

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
        android:minWidth="0dp"

        android:scaleType="center"

        android:src="@drawable/ic_info_outline"

        android:contentDescription="@string/app_permissions_info_button_label"

        style="?android:attr/borderlessButtonStyle" />



</RelativeLayout>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -231,6 +231,9 @@ 
    <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->

    <string name="additional_permissions">Additional permissions</string>



    <!-- Accessibility label for button opening the app-info when clicked [CHAR LIMIT=none] -->

    <string name="app_permissions_info_button_label">Open app info</string>



    <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->

    <plurals name="additional_permissions_more">

        <item quantity="one"><xliff:g id="count" example="1">%1$d</xliff:g> more</item>