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

Commit ef861375 authored by Svetoslav's avatar Svetoslav
Browse files

resolve merge conflicts of c10abb25 to cw-e-dev. 

Change-Id: I3fe38a9ac62466b38efec834dceb712d2782c518
parent 9c78316f

res/drawable/ic_dialog_alert_material.xml

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

Copyright (C) 2014 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.0"

        android:viewportHeight="24.0"

        android:tint="?attr/colorControlNormal">

    <path

        android:pathData="M1,21l22,0L12,2L1,21zM13,18l-2,0l0,-2l2,0L13,18zM13,14l-2,0l0,-4l2,0L13,14z"

        android:fillColor="@android:color/white"/>

</vector>

res/drawable/ic_more_items.xml

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

<!--

    Copyright (C) 2015 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="M3 13h2v-2H3v2zm0 4h2v-2H3v2zm0-8h2V7H3v2zm4 4h14v-2H7v2zm0 4h14v-2H7v2zM7

7v2h14V7H7z" />

    <path

        android:pathData="M0 0h24v24H0z" />

</vector>
 
 No newline at end of file

res/layout/app_details.xml

+4 −4
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ installation screens 
        android:layout_width="32dip"

        android:layout_height="32dip"

        android:layout_marginStart="8dip"

        android:background="@color/transparent"

        android:background="@android:color/transparent"

        android:layout_alignParentStart="true"

        android:gravity="start"

        android:scaleType="centerCrop"/>

res/layout/grant_permissions.xml

+12 −7
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="fill_parent"

    android:layout_height="fill_parent" >



    <LinearLayout

        android:id="@+id/dialog_container"

        android:layout_width="fill_parent"
@@ -46,7 +47,7 @@ 
            android:visibility="gone">

        </CheckBox>



        <com.android.internal.widget.ButtonBarLayout

        <com.android.packageinstaller.permission.ui.ButtonBarLayout

            android:id="@+id/button_group"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -62,8 +63,8 @@ 
                android:paddingBottom="4dp"

                android:paddingEnd="12dp"

                android:singleLine="true"

                style="@android:style/TextAppearance.Material.Body2"

                android:textColor="@color/grant_permissions_progress_color"

                style="?android:attr/textAppearanceSmall"

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

                android:visibility="invisible">

            </TextView>
@@ -72,14 +73,16 @@ 
                android:layout_width="0dp"

                android:layout_height="0dp"

                android:layout_weight="1"

                android:visibility="invisible" />

                android:visibility="invisible" >

            </Space>



            <Button

                android:id="@+id/permission_deny_button"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                style="?android:attr/buttonBarButtonStyle"

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

                android:text="@string/grant_dialog_button_deny" >

            </Button>



            <Button

                android:id="@+id/permission_allow_button"
@@ -87,9 +90,11 @@ 
                android:layout_height="wrap_content"

                style="?android:attr/buttonBarButtonStyle"

                android:layout_marginStart="8dip"

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

                android:text="@string/grant_dialog_button_allow" >

            </Button>



        </com.android.internal.widget.ButtonBarLayout>

        </com.android.packageinstaller.permission.ui.ButtonBarLayout>



    </LinearLayout>



</com.android.packageinstaller.permission.ui.ManualLayoutFrame>

res/layout/header.xml

+3 −12
Original line number Diff line number Diff line
@@ -17,9 +17,8 @@ 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="?android:attr/actionBarSize"

    android:background="@drawable/header_background"

    android:gravity="center_vertical"

    android:theme="@style/Theme.Header.Settings" >

    android:background="?android:attr/colorPrimary"

    android:gravity="center_vertical" >



    <ImageView android:id="@+id/icon"

        android:layout_width="@dimen/header_subsettings_margin_start"
@@ -31,12 +30,11 @@ 
        android:id="@+id/name"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_toStartOf="@+id/app_settings"

        android:layout_marginStart="@dimen/header_subsettings_margin_start"

        android:layout_alignWithParentIfMissing="true"

        android:layout_centerVertical="true"

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

        android:textColor="@android:color/white"

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

        android:textAlignment="viewStart" />



    <ImageView
@@ -52,11 +50,4 @@ 
        android:src="@drawable/ic_info"

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



    <View

        android:id="@+id/row_divider"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?android:attr/listDivider" />



</RelativeLayout>