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

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

Merge "Move resources from frameworks/base to PermissionController"

parents 27d3e805 a53f0242

res/layout/grant_permissions.xml

+2 −4
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ 
            <LinearLayout

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:theme="@*android:style/Theme.DeviceDefault.PermissionGrant"

                style="@*android:style/PermissionGrantDialog">

                android:theme="@style/PermissionGrant"

                style="@style/PermissionGrantDialog">



                <FrameLayout

                    android:id="@+id/content_container"
@@ -105,12 +105,10 @@ 
                        android:background="?android:attr/selectableItemBackground"

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





                </LinearLayout>



             </LinearLayout>





            <!-- allow some space around dialog, esp. in landscape -->

            <Space

                android:layout_width="0dp"

res/layout/grant_permissions_content.xml

+6 −7
Original line number Diff line number Diff line
@@ -23,24 +23,24 @@ 
    android:orientation="vertical"

    android:paddingTop="18dp"

    android:paddingBottom="24dp"

    android:theme="@*android:style/Theme.DeviceDefault.PermissionGrant">

    android:theme="@style/PermissionGrant">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:gravity="center"

        style="@*android:style/PermissionGrantDescription">

        style="@style/PermissionGrantDescription">



        <ImageView

            android:id="@+id/permission_icon"

            style="@*android:style/PermissionGrantTitleIcon" />

            style="@style/PermissionGrantTitleIcon" />



        <TextView

            android:id="@+id/permission_message"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

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

            style="?attr/titleTextStyle" />



    </LinearLayout>
@@ -48,14 +48,13 @@ 
        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        style="@*android:style/PermissionGrantContent" >

        style="@style/PermissionGrantContent" >



        <!-- Option two: Show a detailed message about the change -->

        <TextView

            android:id="@+id/detail_message"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            style="@*android:style/PermissionGrantDetailMessage" />

            style="@style/PermissionGrantDetailMessage" />



    </LinearLayout>

res/layout/review_permissions.xml

+3 −3
Original line number Diff line number Diff line
@@ -24,11 +24,11 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        style="@*android:style/PermissionReviewDescription">

        style="@style/PermissionReviewDescription">



        <ImageView

            android:id="@+id/app_icon"

            style="@*android:style/PermissionReviewTitleIcon" />

            style="@style/PermissionReviewTitleIcon" />



        <TextView

            android:id="@+id/permissions_message"
@@ -43,7 +43,7 @@ 
        android:layout_width="fill_parent"

        android:layout_height="fill_parent"

        android:layout_weight="1"

        style="@*android:style/PermissionReviewSettings" />

        style="@style/PermissionReviewSettings" />



    <LinearLayout

        android:layout_width="fill_parent"

res/values-land/dimens.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  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.

  -->



<!-- Landscape dimensions for the permission grant dialog. -->

<resources>

    <!-- Assuming the dimension of a sailfish, this yields 95% width in splitscreen and 65% in

         landscape -->

    <dimen name="permissionGrantDialogWeight">8.6</dimen>

    <dimen name="permissionGrantDialogWidth">334dp</dimen>

</resources>

res/values-night/themes.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  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.

  -->



<!-- themes for the permission grant dialog. -->

<resources>

    <style name="GrantPermissions"

           parent="@android:style/Theme.DeviceDefault.Panel">

        <item name="android:windowIsFloating">false</item>

        <item name="android:windowTranslucentStatus">true</item>

        <item name="android:backgroundDimEnabled">true</item>

        <item name="android:windowAnimationStyle">@*android:style/Animation.Material.Dialog</item>

        <!-- The following attributes change the behavior of the dialog, hence they should not be

             themed -->

        <item name="android:windowIsTranslucent">true</item>

        <item name="android:windowCloseOnTouchOutside">@*android:bool/config_closeDialogWhenTouchOutside</item>

    </style>



    <style name="PermissionGrant"

           parent="@android:style/Theme.DeviceDefault.Dialog">

        <item name="titleTextStyle">@style/PermissionGrantTitleMessage</item>

    </style>

</resources>
 
 No newline at end of file