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

Commit 256423f1 authored by Nicolas Prevot's avatar Nicolas Prevot
Browse files

Update cross-profile intent resolver. 

Move the profile button one line above.
Change "Work" to "Switch to Work"
Change "Personal" to "Switch to Personal"

BUG:25609998
Change-Id: I002c8e3cc1537b1b9b8b52b79ba639ab5b8e5f88
parent aaa72564

core/java/com/android/internal/app/ResolverActivity.java

+1 −6
Original line number Diff line number Diff line
@@ -392,12 +392,7 @@ public class ResolverActivity extends Activity { 
        final DisplayResolveInfo dri = mAdapter.getOtherProfile();

        if (dri != null) {

            mProfileView.setVisibility(View.VISIBLE);

            final ImageView icon = (ImageView) mProfileView.findViewById(R.id.icon);

            final TextView text = (TextView) mProfileView.findViewById(R.id.text1);

            if (!dri.hasDisplayIcon()) {

                new LoadIconIntoViewTask(dri, icon).execute();

            }

            icon.setImageDrawable(dri.getDisplayIcon());

            final TextView text = (TextView) mProfileView.findViewById(R.id.profile_button);

            text.setText(dri.getDisplayLabel());

        } else {

            mProfileView.setVisibility(View.GONE);

core/res/res/layout/chooser_grid.xml

+24 −39
Original line number Diff line number Diff line
@@ -25,63 +25,48 @@ 
        android:maxCollapsedHeightSmall="56dp"

        android:id="@id/contentPanel">



    <LinearLayout

    <RelativeLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_alwaysShow="true"

            android:elevation="8dp"

            android:paddingStart="16dp"

            android:background="@color/white" >

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

                  android:layout_width="wrap_content"

                  android:layout_height="48dp"

                  android:layout_marginEnd="8dp"

                  android:paddingStart="8dp"

                  android:paddingEnd="8dp"

                  android:visibility="gone"

                  style="?attr/borderlessButtonStyle"

                  android:textAppearance="?attr/textAppearanceButton"

                  android:textColor="@color/material_deep_teal_500"

                  android:gravity="center_vertical"

                  android:layout_alignParentTop="true"

                  android:layout_alignParentRight="true"

                  android:singleLine="true"/>

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

                   android:layout_width="24dp"

                   android:layout_height="24dp"

                   android:layout_gravity="start|center_vertical"

                   android:layout_marginEnd="16dp"

                   android:visibility="gone"

                   android:scaleType="fitCenter" />

                   android:scaleType="fitCenter"

                   android:layout_below="@id/profile_button"

                   android:layout_alignParentLeft="true"

                   />

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

                  android:layout_width="0dp"

                  android:layout_height="wrap_content"

                  android:layout_weight="1"

                  android:layout_width="wrap_content"

                  android:textAppearance="?attr/textAppearanceMedium"

                  android:textSize="14sp"

                  android:gravity="start|center_vertical"

                  android:paddingEnd="?attr/dialogPreferredPadding"

                  android:paddingTop="12dp"

                  android:paddingBottom="12dp" />

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

                      android:layout_width="wrap_content"

                      android:layout_height="48dp"

                      android:layout_marginTop="4dp"

                      android:layout_marginEnd="4dp"

                      android:paddingStart="8dp"

                      android:paddingEnd="8dp"

                      android:paddingTop="4dp"

                      android:paddingBottom="4dp"

                      android:focusable="true"

                      android:visibility="gone"

                      style="?attr/borderlessButtonStyle">

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

                       android:layout_width="24dp"

                       android:layout_height="24dp"

                       android:layout_gravity="start|center_vertical"

                       android:layout_marginStart="4dp"

                       android:layout_marginEnd="16dp"

                       android:layout_marginTop="12dp"

                       android:layout_marginBottom="12dp"

                       android:scaleType="fitCenter" />

            <TextView android:id="@id/text1"

                      android:layout_width="wrap_content"

                      android:layout_height="wrap_content"

                      android:layout_gravity="start|center_vertical"

                      android:layout_marginEnd="16dp"

                      android:textAppearance="?attr/textAppearanceButton"

                      android:textColor="?attr/textColorPrimary"

                      android:minLines="1"

                      android:maxLines="1"

                      android:ellipsize="marquee" />

        </LinearLayout>

    </LinearLayout>

                  android:paddingBottom="12dp"

                  android:layout_below="@id/profile_button"

                  android:layout_toRightOf="@id/title_icon"/>

    </RelativeLayout>



    <ListView

            android:layout_width="match_parent"

core/res/res/layout/resolver_list.xml

+19 −36
Original line number Diff line number Diff line
@@ -25,56 +25,39 @@ 
    android:maxCollapsedHeightSmall="56dp"

    android:id="@id/contentPanel">



    <LinearLayout

    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alwaysShow="true"

        android:elevation="8dp"

        android:background="@color/white" >

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

                  android:layout_width="wrap_content"

                  android:layout_height="48dp"

                  android:layout_marginEnd="8dp"

                  android:paddingStart="8dp"

                  android:paddingEnd="8dp"

                  android:visibility="gone"

                  style="?attr/borderlessButtonStyle"

                  android:textAppearance="?attr/textAppearanceButton"

                  android:textColor="@color/material_deep_teal_500"

                  android:gravity="center_vertical"

                  android:layout_alignParentTop="true"

                  android:layout_alignParentRight="true"

                  android:singleLine="true"/>

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

                  android:layout_width="0dp"

                  android:layout_width="wrap_content"

                  android:layout_height="wrap_content"

                  android:layout_weight="1"

                  android:minHeight="56dp"

                  android:textAppearance="?attr/textAppearanceMedium"

                  android:gravity="start|center_vertical"

                  android:paddingStart="?attr/dialogPreferredPadding"

                  android:paddingEnd="?attr/dialogPreferredPadding"

                  android:paddingTop="8dp"

                  android:layout_below="@id/profile_button"

                  android:layout_alignParentLeft="true"

                  android:paddingBottom="8dp" />

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

                      android:layout_width="wrap_content"

                      android:layout_height="48dp"

                      android:layout_marginTop="4dp"

                      android:layout_marginEnd="4dp"

                      android:paddingStart="8dp"

                      android:paddingEnd="8dp"

                      android:paddingTop="4dp"

                      android:paddingBottom="4dp"

                      android:focusable="true"

                      android:visibility="gone"

                      style="?attr/borderlessButtonStyle">

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

                       android:layout_width="24dp"

                       android:layout_height="24dp"

                       android:layout_gravity="start|center_vertical"

                       android:layout_marginStart="4dp"

                       android:layout_marginEnd="16dp"

                       android:layout_marginTop="12dp"

                       android:layout_marginBottom="12dp"

                       android:scaleType="fitCenter" />

            <TextView android:id="@id/text1"

                      android:layout_width="wrap_content"

                      android:layout_height="wrap_content"

                      android:layout_gravity="start|center_vertical"

                      android:layout_marginEnd="16dp"

                      android:textAppearance="?attr/textAppearanceButton"

                      android:textColor="?attr/textColorPrimary"

                      android:minLines="1"

                      android:maxLines="1"

                      android:ellipsize="marquee" />

        </LinearLayout>

    </LinearLayout>

    </RelativeLayout>



    <ListView

        android:layout_width="match_parent"

core/res/res/values/strings.xml

+4 −4
Original line number Diff line number Diff line
@@ -563,11 +563,11 @@ 
    <!-- Label for the Android system components when they are shown to the user. -->

    <string name="android_system_label">Android System</string>



    <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->

    <string name="user_owner_label">Personal</string>

    <!-- Label for the user owner in the intent forwarding app. -->

    <string name="user_owner_label">Switch to Personal</string>



    <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->

    <string name="managed_profile_label">Work</string>

    <!-- Label for a corporate profile in the intent forwarding app. -->

    <string name="managed_profile_label">Switch to Work</string>



    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permgrouplab_contacts">Contacts</string>