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

Commit 327a359b authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Split success from failure screen 

Also:
    - Support RTL layout
    - Always make title bar colored
    - No animation in between steps of installer

Test: Installed package successfully and failed installing package.
      Rotation of the success screen.

Change-Id: I149907103918b36a6ebd7efcaf8530317a04fb07
parent d6f226a1

AndroidManifest.xml

+7 −2
Original line number Diff line number Diff line
@@ -54,10 +54,15 @@ 
        </activity>



        <activity android:name=".InstallInstalling"

                android:theme="@style/Theme.DialogWhenLargeNoAnimation"

                android:exported="false" />



        <activity android:name=".InstallAppProgress"

                android:configChanges="orientation|keyboardHidden|screenSize"

        <activity android:name=".InstallSuccess"

                android:theme="@style/Theme.DialogWhenLargeNoAnimation"

                android:exported="false" />



        <activity android:name=".InstallFailed"

                android:theme="@style/Theme.DialogWhenLargeNoAnimation"

                android:exported="false" />



        <activity android:name=".UninstallerActivity"

res/layout/op_progress.xml→res/layout/install_failed.xml

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

<!-- Copyright (C) 2008 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.
@@ -19,10 +20,32 @@ 
        android:layout_height="match_parent"

        android:orientation="vertical">



    <include layout="@layout/app_details"

            android:id="@+id/app_snippet" />

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

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

            android:layout_width="match_parent"

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

            android:orientation="horizontal"

            android:elevation="4dp"

            android:gravity="center_vertical">



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

                android:layout_marginStart="16dp"

                android:layout_width="24dp"

                android:layout_height="24dp"

                android:scaleType="fitCenter" />



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

                android:layout_marginStart="32dp"

                android:layout_marginEnd="16dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

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

                android:singleLine="true"

                android:ellipsize="end" />



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

    </LinearLayout>



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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"
@@ -35,38 +58,34 @@ 
                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginBottom="12dp"

                android:src="@drawable/ic_android_92"

                android:src="@drawable/ic_report_problem_92"

                android:contentDescription="@null" />



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

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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="center_horizontal"

                android:text="@string/installing"

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



    </LinearLayout>



    <!-- This explanation text is shown only after the progress bar below goes away. -->

    <ScrollView android:id="@+id/explanation_view"

    <ScrollView android:id="@+id/extended_status_view"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:visibility="gone"

            android:paddingLeft="16dip"

            android:paddingRight="16dip">

            android:padding="16dip">



        <LinearLayout android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">



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

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

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginBottom="8dp"

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



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

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

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -83,7 +102,7 @@ 
            android:measureWithLargestChild="true"

            android:padding="8dip">



        <!-- spacer to push buttons to the right -->

        <!-- spacer to push button to the right -->

        <View android:layout_width="0dp"

                android:layout_height="0dp"

                android:layout_weight="1" />
@@ -95,13 +114,6 @@ 
                android:maxLines="2"

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



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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/launch"

                android:maxLines="2"

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



    </LinearLayout>



</LinearLayout>

res/layout/install_installing.xml

+6 −5
Original line number Diff line number Diff line
@@ -20,26 +20,27 @@ 
        android:layout_height="match_parent"

        android:orientation="vertical">



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

            android:id="@+id/app_snippet"

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

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

            android:layout_width="match_parent"

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

            android:orientation="horizontal"

            android:elevation="4dp"

            android:gravity="center_vertical">



        <ImageView

                android:id="@+id/app_icon"

                android:layout_width="24dp"

                android:layout_height="24dp"

                android:layout_marginLeft="16dp"

                android:layout_marginStart="16dp"

                android:scaleType="fitCenter" />



        <TextView

                android:id="@+id/app_name"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginLeft="32dp"

                android:layout_marginRight="16dp"

                android:layout_marginStart="32dp"

                android:layout_marginEnd="16dp"

                android:ellipsize="end"

                android:singleLine="true"

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

res/layout/install_success.xml

0 → 100644
+100 −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.

  -->



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

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="vertical">



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

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

            android:layout_width="match_parent"

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

            android:orientation="horizontal"

            android:elevation="4dp"

            android:gravity="center_vertical">



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

                android:layout_marginStart="16dp"

                android:layout_width="24dp"

                android:layout_height="24dp"

                android:scaleType="fitCenter" />



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

                android:layout_marginStart="32dp"

                android:layout_marginEnd="16dp"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

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

                android:singleLine="true"

                android:ellipsize="end" />



    </LinearLayout>



    <LinearLayout android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:gravity="center"

            android:orientation="vertical"

            android:paddingLeft="16dip"

            android:paddingRight="16dip">



        <ImageView android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginBottom="12dp"

                android:src="@drawable/ic_done_92"

                android:contentDescription="@null" />



        <TextView android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:gravity="center_horizontal"

                android:text="@string/install_done"

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



    </LinearLayout>



    <LinearLayout style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:measureWithLargestChild="true"

            android:padding="8dip">



        <!-- spacer to push buttons to the right -->

        <View android:layout_width="0dp"

                android:layout_height="0dp"

                android:layout_weight="1" />



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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/done"

                android:maxLines="2"

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



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

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:text="@string/launch"

                android:maxLines="2"

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



    </LinearLayout>



</LinearLayout>

res/values/styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,10 @@ 
        <item name="android:titleTextStyle">@style/TitleText</item>

    </style>



    <style name="Theme.DialogWhenLargeNoAnimation" parent="Theme.DialogWhenLarge">

        <item name="android:windowAnimationStyle">@null</item>

    </style>



    <style name="MediumText"

            parent="@android:style/TextAppearance.Medium">

        <item name="android:textColor">?android:attr/textColorPrimary</item>