Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update cross-profile intent resolver." into nyc-dev

Browse Source 
am: 82b1a68

* commit '82b1a68ed488b5d787c4eee2bc0052b4a76d7ae1':
  Update cross-profile intent resolver.

Change-Id: Icb4a80d4ee7ad571835bf038a4d3f0c316370749
This commit is contained in:
Nicolas Prevot
2016-03-29 13:31:51 +00:00
committed by android-build-merger
parent 9ba6c59bfb 82b1a68ed4
commit f201d49c7b
4 changed files with 48 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/app/ResolverActivity.java
View File

@@ -393,12 +393,7 @@ public class ResolverActivity extends Activity {
final DisplayResolveInfo dri = mAdapter.getOtherProfile(); final DisplayResolveInfo dri = mAdapter.getOtherProfile();
if (dri != null) { if (dri != null) {
mProfileView.setVisibility(View.VISIBLE); mProfileView.setVisibility(View.VISIBLE);
final ImageView icon = (ImageView) mProfileView.findViewById(R.id.icon); final TextView text = (TextView) mProfileView.findViewById(R.id.profile_button);
final TextView text = (TextView) mProfileView.findViewById(R.id.text1);
if (!dri.hasDisplayIcon()) {
new LoadIconIntoViewTask(dri, icon).execute();
}
icon.setImageDrawable(dri.getDisplayIcon());
text.setText(dri.getDisplayLabel()); text.setText(dri.getDisplayLabel());
} else { } else {
mProfileView.setVisibility(View.GONE); mProfileView.setVisibility(View.GONE);

63
core/res/res/layout/chooser_grid.xml
View File

@@ -25,63 +25,48 @@
android:maxCollapsedHeightSmall="56dp" android:maxCollapsedHeightSmall="56dp"
android:id="@id/contentPanel"> android:id="@id/contentPanel">
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
android:elevation="8dp" android:elevation="8dp"
android:paddingStart="16dp" android:paddingStart="16dp"
android:background="@color/white" > 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" <ImageView android:id="@+id/title_icon"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_gravity="start|center_vertical"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:visibility="gone" android:visibility="gone"
android:scaleType="fitCenter" /> android:scaleType="fitCenter"
android:layout_below="@id/profile_button"
android:layout_alignParentLeft="true"
/>
<TextView android:id="@+id/title" <TextView android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_width="wrap_content"
android:textAppearance="?attr/textAppearanceMedium" android:textAppearance="?attr/textAppearanceMedium"
android:textSize="14sp" android:textSize="14sp"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:paddingEnd="?attr/dialogPreferredPadding" android:paddingEnd="?attr/dialogPreferredPadding"
android:paddingTop="12dp" android:paddingTop="12dp"
android:paddingBottom="12dp" /> android:paddingBottom="12dp"
<LinearLayout android:id="@+id/profile_button" android:layout_below="@id/profile_button"
android:layout_width="wrap_content" android:layout_toRightOf="@id/title_icon"/>
android:layout_height="48dp" </RelativeLayout>
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>
<ListView <ListView
android:layout_width="match_parent" android:layout_width="match_parent"

55
core/res/res/layout/resolver_list.xml
View File

@@ -25,56 +25,39 @@
android:maxCollapsedHeightSmall="56dp" android:maxCollapsedHeightSmall="56dp"
android:id="@id/contentPanel"> android:id="@id/contentPanel">
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alwaysShow="true" android:layout_alwaysShow="true"
android:elevation="8dp" android:elevation="8dp"
android:background="@color/white" > 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" <TextView android:id="@+id/title"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:minHeight="56dp" android:minHeight="56dp"
android:textAppearance="?attr/textAppearanceMedium" android:textAppearance="?attr/textAppearanceMedium"
android:gravity="start|center_vertical" android:gravity="start|center_vertical"
android:paddingStart="?attr/dialogPreferredPadding" android:paddingStart="?attr/dialogPreferredPadding"
android:paddingEnd="?attr/dialogPreferredPadding" android:paddingEnd="?attr/dialogPreferredPadding"
android:paddingTop="8dp" android:paddingTop="8dp"
android:layout_below="@id/profile_button"
android:layout_alignParentLeft="true"
android:paddingBottom="8dp" /> android:paddingBottom="8dp" />
<LinearLayout android:id="@+id/profile_button" </RelativeLayout>
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>
<ListView <ListView
android:layout_width="match_parent" android:layout_width="match_parent"

8
core/res/res/values/strings.xml
View File

@@ -563,11 +563,11 @@
<!-- Label for the Android system components when they are shown to the user. --> <!-- Label for the Android system components when they are shown to the user. -->
<string name="android_system_label">Android System</string> <string name="android_system_label">Android System</string>
<!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] --> <!-- Label for the user owner in the intent forwarding app. -->
<string name="user_owner_label">Personal</string> <string name="user_owner_label">Switch to Personal</string>
<!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] --> <!-- Label for a corporate profile in the intent forwarding app. -->
<string name="managed_profile_label">Work</string> <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. --> <!-- 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> <string name="permgrouplab_contacts">Contacts</string>