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

Commit 63f26aee authored by goneil's avatar goneil Committed by android-build-merger
Browse files

Merge "Differentiate Sim App Dialog layout for AOSP" into pi-dev 

am: 1dfd9c81

Change-Id: Ica533e245881f6132bcdc1bd09689cc44eb5b329
parents fa3a2acf 1dfd9c81

packages/SimAppDialog/res/drawable/ic_signal_cellular_alt_rounded_24px.xml→packages/SimAppDialog/res/drawable/ic_signal_cellular_alt_rounded.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -15,8 +15,8 @@ 
    limitations under the License.

    limitations under the License.

-->

-->

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

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

        android:width="21dp"

        android:width="32dp"

        android:height="22dp"

        android:height="32dp"

        android:viewportWidth="21"

        android:viewportWidth="21"

        android:viewportHeight="22">

        android:viewportHeight="22">

packages/SimAppDialog/res/drawable/placeholder.xml

deleted100644 → 0
+0 −44
Original line number Original line 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.

-->

<!-- TODO(b/72511181): replace when illustration is finished -->



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

        android:width="270dp"

        android:height="270dp"

        android:viewportHeight="270.0"

        android:viewportWidth="270.0">

    <path android:fillColor="#E8EAED"

          android:pathData="M183.54,265H84.88c-7.63,0 -13.81,-6.18 -13.81,-13.81V18.81C71.07,11.18 77.25,5 84.88,5h98.66c7.63,0 13.81,6.18 13.81,13.81v232.38C197.35,258.82 191.17,265 183.54,265z"/>

    <path android:fillColor="#BDC1C6"

          android:pathData="M183.54,6.63c6.72,0 12.18,5.46 12.18,12.18v232.38c0,6.72 -5.46,12.18 -12.18,12.18H84.88c-6.72,0 -12.18,-5.46 -12.18,-12.18V18.81c0,-6.72 5.46,-12.18 12.18,-12.18H183.54M183.54,5H84.88c-7.63,0 -13.81,6.18 -13.81,13.81v232.38c0,7.63 6.18,13.81 13.81,13.81h98.66c7.63,0 13.81,-6.18 13.81,-13.81V18.81C197.35,11.18 191.17,5 183.54,5L183.54,5z"/>

    <path android:fillColor="#FFFFFF"

          android:pathData="M186.34,243.74H82.08c-2.41,0 -4.36,-1.95 -4.36,-4.36V30.61c0,-2.41 1.95,-4.36 4.36,-4.36h104.26c2.41,0 4.36,1.95 4.36,4.36v208.78C190.7,241.79 188.75,243.74 186.34,243.74z"/>

    <path android:fillColor="#BDC1C6"

          android:pathData="M156.07,254.78h-43.72c-0.65,0 -1.18,-0.53 -1.18,-1.18v-0.08c0,-0.65 0.53,-1.18 1.18,-1.18h43.72c0.65,0 1.18,0.53 1.18,1.18v0.08C157.25,254.25 156.72,254.78 156.07,254.78z"/>

    <path android:fillColor="#BDC1C6"

          android:pathData="M156.07,17.67h-43.72c-0.65,0 -1.18,-0.53 -1.18,-1.18V16.4c0,-0.65 0.53,-1.18 1.18,-1.18l43.72,0c0.65,0 1.18,0.53 1.18,1.18v0.08C157.25,17.14 156.72,17.67 156.07,17.67z"/>

    <path android:fillColor="#BDC1C6"

          android:pathData="M197.85,84.16h-0.5V67.51h0.5c0.6,0 1.08,0.48 1.08,1.08v14.5C198.93,83.68 198.45,84.16 197.85,84.16z"/>

    <path android:fillColor="#BDC1C6"

          android:pathData="M197.41,136.45h-0.06v-32.87h0.06c0.84,0 1.52,0.68 1.52,1.52v29.84C198.93,135.77 198.25,136.45 197.41,136.45z"/>

    <path android:fillColor="#BDC1C6"

          android:pathData="M119.3,74.73l2.71,2.71c6.74,-6.74 17.67,-6.74 24.4,0l2.71,-2.71C140.89,66.49 127.54,66.49 119.3,74.73zM130.15,85.57l4.07,4.07l4.07,-4.07C136.04,83.33 132.39,83.33 130.15,85.57zM124.72,80.15l2.71,2.71c3.74,-3.74 9.82,-3.74 13.56,0l2.71,-2.71C138.46,74.91 129.96,74.91 124.72,80.15z"/>

    <path android:fillColor="#BDC1C6"

          android:pathData="M143.7,179h-1.36v-2.71h-2.71V179h-10.85v-2.71h-2.71V179h-1.36c-1.5,0 -2.7,1.21 -2.7,2.71l-0.01,18.98c0,1.5 1.21,2.71 2.71,2.71h18.98c1.5,0 2.71,-1.21 2.71,-2.71v-18.98C146.41,180.22 145.2,179 143.7,179zM143.7,200.7h-18.98v-14.91h18.98V200.7zM127.43,188.49h6.78v6.78h-6.78V188.49z"/>

    <path android:fillColor="#BDC1C6"

          android:pathData="M146.41,144.49v-18.98c0,-1.5 -1.21,-2.71 -2.71,-2.71h-18.98c-1.5,0 -2.71,1.21 -2.71,2.71v18.98c0,1.5 1.21,2.71 2.71,2.71h18.98C145.2,147.2 146.41,145.99 146.41,144.49zM129.47,137.03l3.39,4.07l4.75,-6.11l6.1,8.13h-18.98L129.47,137.03z"/>

</vector>

packages/SimAppDialog/res/layout/install_carrier_app_activity.xml

+1 −16
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:id="@+id/setup_wizard_layout"

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_signal_cellular_alt_rounded_24px"

    android:icon="@drawable/ic_signal_cellular_alt_rounded"

    app:suwHeaderText="@string/install_carrier_app_title"

    app:suwHeaderText="@string/install_carrier_app_title"

    app:suwFooter="@layout/install_carrier_app_footer">

    app:suwFooter="@layout/install_carrier_app_footer">
@@ -37,21 +37,6 @@ 
            android:text="@string/install_carrier_app_description_default"

            android:text="@string/install_carrier_app_description_default"

            android:layout_width="match_parent"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"/>

            android:layout_height="wrap_content"/>



        <com.android.setupwizardlib.view.FillContentLayout

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1">



            <!-- TODO(b/72511181): final illo and content description update -->

            <ImageView

                android:src="@drawable/placeholder"

                style="@style/SuwContentIllustration"

                android:contentDescription="@null"

                android:layout_width="match_parent"

                android:layout_height="match_parent"/>



        </com.android.setupwizardlib.view.FillContentLayout>

    </LinearLayout>

    </LinearLayout>





</com.android.setupwizardlib.GlifLayout>
 
</com.android.setupwizardlib.GlifLayout>

packages/SimAppDialog/res/values/strings.xml

+6 −7
Original line number Original line Diff line number Diff line
@@ -15,22 +15,21 @@ 
    limitations under the License.

    limitations under the License.

-->

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- TODO character limits -->

    <!-- The name of this application [CHAR LIMIT=NONE] -->

    <!-- The name of this application -->

    <string name="app_name">Sim App Dialog</string>

    <string name="app_name">Sim App Dialog</string>

    <!-- Install Carrier App Activity -->

    <!-- Install Carrier App Activity -->

    <!-- Title of screen asking user to download the carrier app to match the inserted SIM card -->

    <!-- Title of screen asking user to download the carrier app to match the inserted SIM card [CHAR LIMIT=30] -->

    <string name="install_carrier_app_title">Activate mobile service</string>

    <string name="install_carrier_app_title">Activate mobile service</string>

    <!-- Description of screen asking user to download the carrier app to match the inserted SIM card if we know the name of the carrier-->

    <!-- Description of screen asking user to download the carrier app to match the inserted SIM card if we know the name of the carrier [CHAR LIMIT=90] -->

    <string name="install_carrier_app_description">To get your new SIM working properly, you\'ll

    <string name="install_carrier_app_description">To get your new SIM working properly, you\'ll

        need to install the <xliff:g name="carrier_name" example="Project Fi">%1$s</xliff:g> app

        need to install the <xliff:g name="carrier_name" example="Project Fi">%1$s</xliff:g> app

    </string>

    </string>

    <!-- Description of screen asking user to download the carrier app to match the inserted SIM card if we don't know the name of the carrier-->

    <!-- Description of screen asking user to download the carrier app to match the inserted SIM card if we don't know the name of the carrier  [CHAR LIMIT=100] -->

    <string name="install_carrier_app_description_default">To get your new SIM working properly,

    <string name="install_carrier_app_description_default">To get your new SIM working properly,

        you\'ll need to install the carrier app

        you\'ll need to install the carrier app

    </string>

    </string>

    <!-- Name of the button used to defer downloading the carrier app -->

    <!-- Name of the button used to defer downloading the carrier app  [CHAR LIMIT=25]-->

    <string name="install_carrier_app_defer_action">Not now</string>

    <string name="install_carrier_app_defer_action">Not now</string>

    <!-- Name of the button for downloading the carrier app -->

    <!-- Name of the button for downloading the carrier app [CHAR LIMIT=25] -->

    <string name="install_carrier_app_download_action">Download app</string>

    <string name="install_carrier_app_download_action">Download app</string>

</resources>
 
</resources>
 
 No newline at end of file