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

Commit ed277a10 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge "Auto-link web urls in support messages." into nyc-dev am: 67d068e5 

am: 6cd4555a

* commit '6cd4555a':
  Auto-link web urls in support messages.

Change-Id: I891fb47cf6c1ff220d5cf9c90d9f4fe12fcf3d1e
parents 45f00329 6cd4555a

res/layout/admin_support_details_content.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
            android:textAppearance="@android:style/TextAppearance.Material.Subhead"

            android:text="@string/default_admin_support_msg"

            android:maxLength="200"

            android:autoLink="email|phone"

            android:autoLink="email|phone|web"

            android:textColor="?android:attr/textColorSecondary" />

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

            android:layout_width="match_parent"

res/layout/device_admin_add.xml

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

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

                    android:autoLink="email|phone"

                    android:autoLink="email|phone|web"

                    android:padding="10dip" />

            </LinearLayout>