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

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

Merge "Remove the app action buttons from permissions screens."

parents 6ad047cf a4e2e7c6

PermissionController.mk

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ LOCAL_STATIC_ANDROID_LIBRARIES += \ 
    SettingsLibSearchWidget \

    SettingsLibSettingsSpinner \

    SettingsLibLayoutPreference \

    SettingsLibActionButtonsPreference \

    SettingsLibBarChartPreference \

    SettingsLibActionBarShadow \

    SettingsLibProgressBar

res/drawable/ic_delete.xml

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<!--

  Copyright (C) 2018 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:fillColor="#FF000000"

        android:pathData="M15,4V3H9v1H4v2h1v13c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V6h1V4H15zM17,19H7V6h10V19z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,8h2v9h-2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,8h2v9h-2z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_force_stop.xml

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<!--

  Copyright (C) 2018 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:fillColor="#FF000000"

        android:pathData="M12,5.99L19.53,19H4.47L12,5.99M12,2L1,21h22L12,2L12,2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,16l-2,0l0,2l2,0l0,-2z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M13,10l-2,0l0,4l2,0l0,-4z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_open.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<!--

  Copyright (C) 2018 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:fillColor="#FF000000"

        android:pathData="M19,19H5V5h7V3H5C3.89,3 3,3.9 3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2v-7h-2V19zM14,3v2h3.59l-9.83,9.83l1.41,1.41L19,6.41V10h2V3H14z"/>

</vector>
 
 No newline at end of file

res/layout/app_permission.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
            android:layout_height="wrap_content"

            android:orientation="vertical">



            <include layout="@layout/button_header" />

            <include layout="@layout/header_large" />



            <LinearLayout

                android:layout_width="match_parent"