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

Commit 5b81d8be authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Make side-load install path material design-y" into nyc-dev

parents 789b2e8e db783edf

res/drawable/ic_android_92.xml

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

<!-- Copyright (C) 2016 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="92dp"

        android:height="92dp"

        android:viewportWidth="92.0"

        android:viewportHeight="92.0">

    <path

        android:fillColor="#C8CCCE"

        android:pathData="m23,69c0,2.11 1.72,3.83 3.83,3.83h3.83v13.42c0,3.18 2.57,5.75 5.75,5.75 3.18,0 5.75,-2.57 5.75,-5.75L42.17,72.83h7.67v13.42c0,3.18 2.57,5.75 5.75,5.75 3.18,0 5.75,-2.57 5.75,-5.75L61.33,72.83h3.83c2.11,0 3.83,-1.72 3.83,-3.83L69,30.67L23,30.67L23,69zM13.42,30.67c-3.18,0 -5.75,2.57 -5.75,5.75v26.83c0,3.18 2.57,5.75 5.75,5.75 3.18,0 5.75,-2.57 5.75,-5.75L19.17,36.42c0,-3.18 -2.57,-5.75 -5.75,-5.75zM78.58,30.67c-3.18,0 -5.75,2.57 -5.75,5.75v26.83c0,3.18 2.57,5.75 5.75,5.75 3.18,0 5.75,-2.57 5.75,-5.75L84.33,36.42c0,-3.18 -2.57,-5.75 -5.75,-5.75zM59.53,8.28 L64.53,3.28c0.75,-0.75 0.75,-1.95 0,-2.7 -0.75,-0.75 -1.95,-0.75 -2.7,0L56.16,6.23C53.09,4.72 49.66,3.84 46,3.84c-3.68,0 -7.13,0.88 -10.22,2.41L30.09,0.56c-0.75,-0.75 -1.95,-0.75 -2.7,0 -0.75,0.75 -0.75,1.95 0,2.7l5.02,5.02C26.72,12.48 23,19.23 23,26.84h46c0,-7.63 -3.74,-14.37 -9.47,-18.55zM38.33,19.17h-3.83v-3.83h3.83v3.83zM57.5,19.17h-3.83v-3.83h3.83v3.83z"/>

</vector>

res/drawable/ic_done_92.xml

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

<!-- Copyright (C) 2016 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="92dp"

        android:height="92dp"

        android:viewportWidth="92.0"

        android:viewportHeight="92.0">

    <path

        android:fillColor="#C8CCCE"

        android:pathData="M34.5,61.99 L18.51,46 13.09,51.42 34.5,72.83l46,-46 -5.42,-5.42z"/>

</vector>

res/drawable/ic_result_status.xml→res/drawable/ic_report_problem_92.xml

+11 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project

<!-- Copyright (C) 2016 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.
@@ -13,9 +13,13 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<level-list xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- success state -->

    <item android:maxLevel="0" android:drawable="@drawable/ic_success_material"/>

    <!-- failure state -->

    <item android:maxLevel="1" android:drawable="@drawable/ic_fail_material"/>

</level-list>
 
 No newline at end of file
 


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

        android:width="92dp"

        android:height="92dp"

        android:viewportWidth="92.0"

        android:viewportHeight="92.0">

    <path

        android:fillColor="#C8CCCE"

        android:pathData="M2,84H90L46,8 2,84zM50,72h-8v-8h8v8zM50,56H42V40h8v16z"/>

</vector>

res/layout/app_details.xml

+21 −42
Original line number Diff line number Diff line
@@ -18,49 +18,28 @@ 
Defines the layout of the application snippet that appears on top of the

installation screens

-->

<!-- The snippet about the application - title, icon, description.  -->

<RelativeLayout

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

<!-- The snippet about the application - title, icon -->

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

        android:id="@+id/app_snippet"

        android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:paddingStart="16dip"

    android:paddingEnd="16dip"

    android:paddingTop="24dip"

    >

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

        android:padding="16dp"

        android:orientation="horizontal">



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

        android:layout_width="32dip"

        android:layout_height="32dip"

        android:layout_marginStart="8dip"

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

        android:layout_alignParentStart="true"

        android:gravity="start"

        android:scaleType="centerCrop"/>

            android:layout_width="24dp"

            android:layout_height="24dp"

            android:layout_gravity="center_vertical"

            android:scaleType="fitCenter" />



    <TextView android:id="@+id/app_name"

            android:layout_gravity="center_vertical"

            android:layout_marginLeft="32dp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

        android:gravity="center"

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

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

        android:layout_toEndOf="@id/app_icon"

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

            android:singleLine="true"

        android:layout_centerInParent="true"

        android:paddingEnd="16dip"

        android:paddingTop="3dip"

        android:paddingStart="16dip"

            android:ellipsize="end" />

    <FrameLayout

        android:id="@+id/top_divider"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingTop="4dip"

        android:layout_below="@id/app_name">

        <ProgressBar

            android:id="@+id/progress_bar"

            style="?android:attr/progressBarStyleHorizontal"

            android:layout_width="match_parent"

            android:layout_height="wrap_content" />

    </FrameLayout>



</RelativeLayout>

</LinearLayout>

res/layout/install_confirm.xml

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

<!-- Copyright (C) 2008 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.

-->



<!--



  Defines the layout of the splash screen that displays the security

  settings required for an application and requests the confirmation of the

  user before it is installed.

-->



<LinearLayout

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

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



    <TextView

            android:id="@+id/install_confirm_question"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:paddingStart="16dip"

            android:paddingEnd="16dip"

            android:text="@string/install_confirm_question"

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

            android:paddingTop="4dip" />



    <ImageView

            android:id="@+id/divider"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

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

            android:visibility="gone" />



    <FrameLayout

        android:id="@+id/filler"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:visibility="gone">

    </FrameLayout>



    <TabHost

        android:id="@android:id/tabhost"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_weight="1">



        <LinearLayout

            android:orientation="vertical"

            android:layout_width="match_parent"

            android:layout_height="match_parent">



            <HorizontalScrollView android:id="@+id/tabscontainer"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:background="@drawable/tab_unselected_holo"

                android:fillViewport="true"

                android:scrollbars="none">

                <FrameLayout android:layout_width="match_parent"

                             android:layout_height="wrap_content">

                    <TabWidget

                        android:id="@android:id/tabs"

                        android:orientation="horizontal"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_gravity="center" />

                </FrameLayout>

            </HorizontalScrollView>



            <FrameLayout

                android:id="@android:id/tabcontent"

                android:layout_width="0dp"

                android:layout_height="0dp"

                android:layout_weight="0"/>



            <android.support.v4.view.ViewPager

                android:id="@+id/pager"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"/>



        </LinearLayout>

    </TabHost>



    <!-- OK confirm and cancel buttons.  -->

    <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:divider="?android:attr/dividerHorizontal"

            android:showDividers="beginning">



        <LinearLayout

                style="?android:attr/buttonBarStyle"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:measureWithLargestChild="true">



            <LinearLayout android:id="@+id/leftSpacer"

                    android:layout_weight="0.25"

                    android:layout_width="0dip"

                    android:layout_height="wrap_content"

                    android:orientation="horizontal"

                    android:visibility="gone" />



            <Button android:id="@+id/cancel_button"

                    android:layout_width="0dip"

                    android:layout_height="wrap_content"

                    android:layout_gravity="start"

                    android:layout_weight="1"

                    android:text="@string/cancel"

                    android:maxLines="2"

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



            <Button android:id="@+id/ok_button"

                    android:layout_width="0dip"

                    android:layout_height="wrap_content"

                    android:layout_gravity="end"

                    android:layout_weight="1"

                    android:text="@string/next"

                    android:maxLines="2"

                    android:filterTouchesWhenObscured="true"

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



            <LinearLayout android:id="@+id/rightSpacer"

                    android:layout_width="0dip"

                    android:layout_weight="0.25"

                    android:layout_height="wrap_content"

                    android:orientation="horizontal"

                    android:visibility="gone" />



        </LinearLayout>

    </LinearLayout>

</LinearLayout>