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

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

Merge "Remove permission justification UI."

parents 7e39ea0e 2a1c9210

res/drawable/ic_attach_money_black.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="#000000"

        android:pathData="M11.8 10.9c-2.27-0.59-3-1.2-3-2.15 0-1.09 1.01-1.85 2.7-1.85 1.78 0 2.44 0.85

2.5 2.1h2.21c-0.07-1.72-1.12-3.3-3.21-3.81V3h-3v2.16c-1.94 0.42 -3.5 1.68-3.5

3.61 0 2.31 1.91 3.46 4.7 4.13 2.5 0.6 3 1.48 3 2.41 0 0.69-0.49 1.79-2.7

1.79-2.06 0-2.87-0.92-2.98-2.1h-2.2c0.12 2.19 1.76 3.42 3.68

3.83V21h3v-2.15c1.95-0.37 3.5-1.5 3.5-3.55 0-2.84-2.43-3.81-4.7-4.4z" />

    <path

        android:pathData="M0 0h24v24H0z" />

</vector>
 
 No newline at end of file

res/drawable/ic_backup.xml

deleted100644 → 0
+0 −32
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="#000000"

        android:pathData="M17.92,10.02C17.45,7.18,14.97,5,12,5C9.82,5,7.83,6.18,6.78,8.06C4.09,8.41,2,10.74,2,13.5C2,16.53,4.47,19,7.5,19h10

c2.48,0,4.5-2.02,4.5-4.5C22,12.16,20.21,10.23,17.92,10.02z

M17.5,17h-10C5.57,17,4,15.43,4,13.5c0-1.89,1.54-3.46,3.44-3.49

L8.08,10l0.26-0.59C8.97,7.94,10.41,7,12,7c2.21,0,4,1.79,4,4v1h1.5c1.38,0,2.5,1.12,2.5,2.5S18.88,17,17.5,17z

M9.91,14.41L8.5,13

l2.79-2.79L12,9.5l0.71,0.71L15.5,13l-1.41,1.41L13,13.33V16h-2v-2.67L9.91,14.41z" />

    <path

        android:pathData="M0,0h24v24H0V0z" />

</vector>
 
 No newline at end of file

res/drawable/ic_business_black.xml

deleted100644 → 0
+0 −29
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:pathData="M0 0h24v24H0z" />

    <path

        android:fillColor="#000000"

        android:pathData="M12 7V3H2v18h20V7H12zM6 19H4v-2h2v2zm0-4H4v-2h2v2zm0-4H4V9h2v2zm0-4H4V5h2v2zm4

12H8v-2h2v2zm0-4H8v-2h2v2zm0-4H8V9h2v2zm0-4H8V5h2v2zm10

12h-8v-2h2v-2h-2v-2h2v-2h-2V9h8v10zm-2-8h-2v2h2v-2zm0 4h-2v2h2v-2z" />

</vector>
 
 No newline at end of file

res/drawable/ic_timelapse_black.xml

deleted100644 → 0
+0 −29
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:pathData="M0 0h24v24H0z" />

    <path

        android:fillColor="#000000"

        android:pathData="M16.24 7.76C15.07 6.59 13.54 6 12 6v6l-4.24 4.24c2.34 2.34 6.14 2.34 8.49 0

2.34-2.34 2.34-6.14-0.01-8.48zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48

10-10S17.52 2 12 2zm0 18c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8z" />

</vector>
 
 No newline at end of file

res/layout/app_permission.xml

+0 −121
Original line number Diff line number Diff line
@@ -142,127 +142,6 @@ 
                    android:layout_height="wrap_content"

                    style="@style/FooterText"/>



                <LinearLayout

                    android:id="@+id/justification_all"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="vertical">



                    <TextView

                        android:id="@+id/justification_header"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        style="@style/FooterText"/>



                    <LinearLayout

                        android:id="@+id/justification_entries"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:orientation="vertical">



                        <LinearLayout

                            android:id="@+id/justification_sent_off_device"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            android:gravity="center_vertical"

                            android:orientation="horizontal"

                            style="@style/FooterListEntry">



                            <ImageView

                                android:scaleType="fitCenter"

                                android:gravity="start"

                                style="@style/JustificationIcon"

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



                            <TextView

                                android:id="@+id/justification_sent_off_device_text"

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"/>



                        </LinearLayout>



                        <LinearLayout

                            android:id="@+id/justification_shared_with_third_party"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            android:gravity="center_vertical"

                            android:orientation="horizontal"

                            style="@style/FooterListEntry">



                            <ImageView

                                android:scaleType="fitCenter"

                                android:gravity="start"

                                style="@style/JustificationIcon"

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



                            <TextView

                                android:id="@+id/justification_shared_with_third_party_text"

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"/>



                        </LinearLayout>



                        <LinearLayout

                            android:id="@+id/justification_used_for_monetization"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            android:gravity="center_vertical"

                            android:orientation="horizontal"

                            style="@style/FooterListEntry">



                            <ImageView

                                android:scaleType="fitCenter"

                                android:gravity="start"

                                style="@style/JustificationIcon"

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



                            <TextView

                                android:id="@+id/justification_used_for_monetization_text"

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"/>



                        </LinearLayout>



                        <LinearLayout

                            android:id="@+id/justification_retention"

                            android:layout_width="match_parent"

                            android:layout_height="wrap_content"

                            android:gravity="center_vertical"

                            android:orientation="horizontal"

                            style="@style/FooterListEntry">



                            <ImageView

                                android:scaleType="fitCenter"

                                android:gravity="start"

                                style="@style/JustificationIcon"

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



                            <TextView

                                android:id="@+id/justification_retention_text"

                                android:layout_width="wrap_content"

                                android:layout_height="wrap_content"/>



                        </LinearLayout>



                    </LinearLayout>



                    <TextView

                        android:id="@+id/justification_footer"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:text="@string/permission_justification_footer"

                        style="@style/FooterText"/>



                    <TextView

                        android:id="@+id/justification_info_intent"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        style="@style/FooterText"

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

                        android:clickable="true"/>



                </LinearLayout>



                <TextView

                    android:id="@+id/usage_link"

                    android:layout_width="wrap_content"