diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-14 21:55:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-14 21:55:16 +0000 |
commit | 54d17dff6db6847b33bf07e1af6fbaa2e3bbe19d (patch) | |
tree | 82db2e21449fd52665d7cff5f67b72ea655d185f /res/layout | |
parent | edd51ad30741098e2110e3d0533085b02cbe752c (diff) | |
parent | 00e827c70cb4213ee05140157006a37d12662448 (diff) | |
download | android_packages_apps_Trebuchet-54d17dff6db6847b33bf07e1af6fbaa2e3bbe19d.tar.gz android_packages_apps_Trebuchet-54d17dff6db6847b33bf07e1af6fbaa2e3bbe19d.tar.bz2 android_packages_apps_Trebuchet-54d17dff6db6847b33bf07e1af6fbaa2e3bbe19d.zip |
am 00e827c7: am 5fcaab43: am ea9ad5ce: Merge remote-tracking branch \'origin/ub-launcher3-burnaby\' into mnc-dev
* commit '00e827c70cb4213ee05140157006a37d12662448': (76 commits)
Restoring provider behavior for reloading app on old devices > For older devices, launcher will only reload in case of inserts with specific query parameters > For older devices, launcehr will notify content observers of any internal inserts > Chaning TAG for Launcher provider as max logging tag is only 23 characters
Removing items which are on invalid screen
Preventing null pointer crash when opening a folder
Revert workaround for move to default screen on home intent.
Fixing NPE in recycler view scroll bar.
Adding workaround for regression caused by ag/752175
Adding gradle script for Android Studio
Override the overscroll color for the widget rows.
Adding graphic for all apps empty search screen.
Using GET_UNINSTALLED_PACKAGES flag when getting packageInfo for a managed profile app
Revert "Adding viewId for the QSB"
Adding viewId for the QSB
Fixing issue with missing scroll bar after fast-scrolling and searching.
Fixing an issue where you would inadvertently start fastscrolling.
Pending bind callbacks should be cleared before starting the loader, similar to startBinding
Fixing widgets container inactive scroll bar color.
Making the detached scrollbar catch up faster to the actual scroll position.
Updating theme to use the light theme by default, instead of wallpaper theme > This allows us to use all the goodness of material theme > Cursor in folder edit text is no longer 1px wide
Updating the target sdk to launcher
Using the usermanager api to get creation time
...
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/all_apps_empty_search.xml | 15 | ||||
-rw-r--r-- | res/layout/all_apps_search_bar.xml | 17 | ||||
-rw-r--r-- | res/layout/all_apps_search_market.xml | 29 | ||||
-rw-r--r-- | res/layout/all_apps_search_market_divider.xml | 27 | ||||
-rw-r--r-- | res/layout/overview_panel.xml | 3 | ||||
-rw-r--r-- | res/layout/user_folder.xml | 3 | ||||
-rw-r--r-- | res/layout/widgets_list_row_view.xml | 1 |
7 files changed, 77 insertions, 18 deletions
diff --git a/res/layout/all_apps_empty_search.xml b/res/layout/all_apps_empty_search.xml index f60c4a09a..5439111a2 100644 --- a/res/layout/all_apps_empty_search.xml +++ b/res/layout/all_apps_empty_search.xml @@ -18,11 +18,14 @@ android:id="@+id/empty_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="center" - android:paddingTop="24dp" - android:paddingBottom="24dp" - android:paddingRight="@dimen/all_apps_grid_view_start_margin" - android:textSize="16sp" - android:textColor="#4c4c4c" + android:gravity="start" + android:paddingTop="@dimen/all_apps_empty_search_message_top_offset" + android:paddingBottom="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:fontFamily="sans-serif-medium" + android:textSize="14sp" + android:textColor="#212121" + android:alpha="0.56" android:focusable="false" /> diff --git a/res/layout/all_apps_search_bar.xml b/res/layout/all_apps_search_bar.xml index cf30eac36..69a66c817 100644 --- a/res/layout/all_apps_search_bar.xml +++ b/res/layout/all_apps_search_bar.xml @@ -32,14 +32,13 @@ android:id="@+id/dismiss_search_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="4dp" - android:layout_marginStart="4dp" + android:layout_gravity="center_vertical" + android:layout_marginLeft="16dp" + android:layout_marginStart="16dp" android:contentDescription="@string/all_apps_button_label" - android:paddingBottom="13dp" - android:paddingTop="13dp" android:src="@drawable/ic_arrow_back_grey" /> - <com.android.launcher3.allapps.AllAppsSearchEditView + <com.android.launcher3.ExtendedEditText android:id="@+id/search_box_input" android:layout_width="match_parent" android:layout_height="match_parent" @@ -48,7 +47,7 @@ android:gravity="fill_horizontal|center_vertical" android:hint="@string/all_apps_search_bar_hint" android:inputType="text|textNoSuggestions|textCapWords" - android:imeOptions="actionDone|flagNoExtractUi" + android:imeOptions="actionSearch|flagNoExtractUi" android:maxLines="1" android:paddingLeft="8dp" android:scrollHorizontally="true" @@ -63,10 +62,8 @@ android:layout_width="wrap_content" android:layout_height="@dimen/all_apps_search_bar_height" android:layout_gravity="end|center_vertical" - android:layout_marginEnd="4dp" - android:layout_marginRight="4dp" + android:layout_marginEnd="16dp" + android:layout_marginRight="16dp" android:contentDescription="@string/all_apps_search_bar_hint" - android:paddingBottom="13dp" - android:paddingTop="13dp" android:src="@drawable/ic_search_grey" /> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/all_apps_search_market.xml b/res/layout/all_apps_search_market.xml new file mode 100644 index 000000000..1ed508890 --- /dev/null +++ b/res/layout/all_apps_search_market.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/search_market_text" + android:layout_width="wrap_content" + android:layout_height="48dp" + android:gravity="start|center_vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:fontFamily="sans-serif-medium" + android:textSize="14sp" + android:textColor="@color/launcher_accent_color" + android:textAllCaps="true" + android:focusable="false" + android:background="@drawable/all_apps_search_market_bg" /> diff --git a/res/layout/all_apps_search_market_divider.xml b/res/layout/all_apps_search_market_divider.xml new file mode 100644 index 000000000..39097818f --- /dev/null +++ b/res/layout/all_apps_search_market_divider.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> +<ImageView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:paddingTop="16dp" + android:paddingBottom="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:focusable="false" + android:scaleType="matrix" + android:src="@drawable/horizontal_line" />
\ No newline at end of file diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml index 4b7423eba..1f02dce3c 100644 --- a/res/layout/overview_panel.xml +++ b/res/layout/overview_panel.xml @@ -32,6 +32,7 @@ android:gravity="center_horizontal" android:text="@string/wallpaper_button_text" android:textAllCaps="true" + android:textColor="@android:color/white" android:textSize="12sp" /> <TextView @@ -45,6 +46,7 @@ android:gravity="center_horizontal" android:text="@string/widget_button_text" android:textAllCaps="true" + android:textColor="@android:color/white" android:textSize="12sp" /> <TextView @@ -58,6 +60,7 @@ android:gravity="center_horizontal" android:text="@string/settings_button_text" android:textAllCaps="true" + android:textColor="@android:color/white" android:textSize="12sp" /> </LinearLayout>
\ No newline at end of file diff --git a/res/layout/user_folder.xml b/res/layout/user_folder.xml index ecf7def48..252ebf01e 100644 --- a/res/layout/user_folder.xml +++ b/res/layout/user_folder.xml @@ -53,7 +53,7 @@ android:paddingLeft="8dp" android:paddingRight="8dp" > - <com.android.launcher3.FolderEditText + <com.android.launcher3.ExtendedEditText android:id="@+id/folder_name" android:layout_width="0dp" android:layout_height="wrap_content" @@ -70,7 +70,6 @@ android:textColor="#ff777777" android:textColorHighlight="#ffCCCCCC" android:textColorHint="#ff808080" - android:textCursorDrawable="@null" android:textSize="14sp" /> <include diff --git a/res/layout/widgets_list_row_view.xml b/res/layout/widgets_list_row_view.xml index ced564801..1d593dfd1 100644 --- a/res/layout/widgets_list_row_view.xml +++ b/res/layout/widgets_list_row_view.xml @@ -51,6 +51,7 @@ <HorizontalScrollView android:id="@+id/widgets_scroll_container" + android:theme="@style/Theme.Dark.CustomOverscroll" android:layout_width="wrap_content" android:layout_height="wrap_content" android:scrollbars="none"> |