summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorTony Mak <tonymak@google.com>2017-12-15 17:11:17 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2017-12-15 17:11:17 +0000
commitd33d081db349d07ebca71ed39f484f0796d8ceab (patch)
treebd95cfb0cba6e1b0ab7ac0655bfafdb504199df4 /res
parentd56d7b97000fe24ad072331c0f9741327923bb8e (diff)
parent2bfa4d469a271c9e43a9e4c55a8da3c0a203acb8 (diff)
downloadandroid_packages_apps_Trebuchet-d33d081db349d07ebca71ed39f484f0796d8ceab.tar.gz
android_packages_apps_Trebuchet-d33d081db349d07ebca71ed39f484f0796d8ceab.tar.bz2
android_packages_apps_Trebuchet-d33d081db349d07ebca71ed39f484f0796d8ceab.zip
Merge changes I218fe7d9,I60ef59de into ub-launcher3-master
* changes: Make work footer stick to the bottom if there are only a few apps #2 Make work footer stick to the bottom if there are only a few apps
Diffstat (limited to 'res')
-rw-r--r--res/layout/work_tab_footer.xml106
-rw-r--r--res/values/strings.xml2
2 files changed, 59 insertions, 49 deletions
diff --git a/res/layout/work_tab_footer.xml b/res/layout/work_tab_footer.xml
index 48578d799..2606b87a1 100644
--- a/res/layout/work_tab_footer.xml
+++ b/res/layout/work_tab_footer.xml
@@ -13,60 +13,68 @@
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="wrap_content"
- android:orientation="vertical"
- android:paddingBottom="@dimen/all_apps_work_profile_tab_footer_bottom_padding"
- android:paddingLeft="@dimen/dynamic_grid_cell_padding_x"
- android:paddingRight="@dimen/dynamic_grid_cell_padding_x"
- android:paddingTop="@dimen/all_apps_work_profile_tab_footer_top_padding">
+<com.android.launcher3.views.WorkFooterContainer
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="@dimen/all_apps_work_profile_tab_footer_bottom_padding"
+ android:paddingLeft="@dimen/dynamic_grid_cell_padding_x"
+ android:paddingRight="@dimen/dynamic_grid_cell_padding_x"
+ android:paddingTop="@dimen/all_apps_work_profile_tab_footer_top_padding">
- <RelativeLayout
+ <ImageView
+ android:id="@+id/work_footer_divider"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:focusable="false"
+ android:importantForAccessibility="no"
+ android:paddingBottom="@dimen/all_apps_divider_margin_vertical"
+ android:paddingTop="@dimen/all_apps_divider_margin_vertical"
+ android:scaleType="fitXY"
+ android:src="@drawable/all_apps_divider"/>
- <Switch
- android:id="@+id/work_mode_toggle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
- android:theme="@style/WorkModeSwitchTheme"/>
+ <Switch
+ android:id="@+id/work_mode_toggle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:layout_below="@id/work_footer_divider"
+ android:theme="@style/WorkModeSwitchTheme"/>
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBaseline="@id/work_mode_toggle"
- android:layout_alignParentLeft="true"
- android:ellipsize="end"
- android:fontFamily="roboto-regular"
- android:lines="1"
- android:text="@string/work_profile_toggle_label"
- android:textColor="?android:attr/textColorTertiary"
- android:textSize="16sp"/>
+ <TextView
+ android:id="@android:id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignBaseline="@id/work_mode_toggle"
+ android:layout_alignParentStart="true"
+ android:ellipsize="end"
+ android:lines="1"
+ android:text="@string/work_profile_toggle_label"
+ android:textColor="?android:attr/textColorTertiary"
+ android:textSize="16sp"/>
- </RelativeLayout>
+ <ImageView
+ android:id="@android:id/icon"
+ android:layout_width="24dp"
+ android:layout_height="24dp"
+ android:layout_below="@android:id/title"
+ android:layout_marginTop="8dp"
+ android:src="@drawable/ic_corp"/>
- <LinearLayout
- android:layout_width="match_parent"
+ <TextView
+ android:id="@+id/managed_by_label"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:paddingTop="8dp">
-
- <ImageView
- android:layout_width="24dp"
- android:layout_height="24dp"
- android:src="@drawable/ic_corp"/>
+ android:layout_below="@android:id/title"
+ android:layout_marginTop="8dp"
+ android:layout_toEndOf="@android:id/icon"
+ android:ellipsize="end"
+ android:gravity="center_vertical"
+ android:lines="1"
+ android:minHeight="24dp"
+ android:paddingStart="12dp"
+ android:text="@string/managed_by_your_organisation"
+ android:textColor="?android:attr/textColorHint"
+ android:textSize="13sp"/>
- <TextView
- android:id="@+id/managed_by_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:ellipsize="end"
- android:lines="1"
- android:paddingLeft="12dp"
- android:textColor="?android:attr/textColorHint"
- android:textSize="13sp"/>
- </LinearLayout>
-</LinearLayout> \ No newline at end of file
+</com.android.launcher3.views.WorkFooterContainer> \ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index eca64c852..d77065c11 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -330,5 +330,7 @@
<string name="bottom_work_tab_user_education_title">Find work apps here</string>
<!-- Body text in bottom user education view in work tab -->
<string name="bottom_work_tab_user_education_body">Each work app has an orange badge, which means it\'s kept secure by your organization. Work apps can be moved to your Home Screen for easier access.</string>
+ <!-- Label in work tab to tell users that work profile is managed by their organisation. -->
+ <string name="managed_by_your_organisation">Managed by your organisation</string>
</resources>