diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2015-05-19 21:07:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-19 21:07:40 +0000 |
| commit | bc0998670bca9995cca98e07004855dd28f29a10 (patch) | |
| tree | 12e8fce983a30e368ae08c5373360b1610220324 /res/layout | |
| parent | 0b493c86c5d0803f11095b71396ffac0097d26ef (diff) | |
| parent | 4b6eb269502d05edabf883535a7099da5862de42 (diff) | |
| download | android_packages_apps_Trebuchet-bc0998670bca9995cca98e07004855dd28f29a10.tar.gz android_packages_apps_Trebuchet-bc0998670bca9995cca98e07004855dd28f29a10.tar.bz2 android_packages_apps_Trebuchet-bc0998670bca9995cca98e07004855dd28f29a10.zip | |
Merge "Adding drop shadow effect in allapps" into ub-launcher3-burnaby
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/apps_grid_icon_view.xml | 1 | ||||
| -rw-r--r-- | res/layout/apps_list_view.xml | 5 | ||||
| -rw-r--r-- | res/layout/apps_prediction_bar_icon_view.xml | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/res/layout/apps_grid_icon_view.xml b/res/layout/apps_grid_icon_view.xml index 67d7d50e7..7165f383d 100644 --- a/res/layout/apps_grid_icon_view.xml +++ b/res/layout/apps_grid_icon_view.xml @@ -25,6 +25,5 @@ android:paddingBottom="@dimen/apps_icon_top_bottom_padding" android:focusable="true" android:background="@drawable/focusable_view_bg" - launcher:deferShadowGeneration="true" launcher:iconDisplay="all_apps" /> diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml index 03ba646ee..6f9be05af 100644 --- a/res/layout/apps_list_view.xml +++ b/res/layout/apps_list_view.xml @@ -14,7 +14,8 @@ See the License for the specific language governing permissions and limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.launcher3.AppsRecyclerViewContainer + xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/apps_list" android:layout_width="match_parent" android:layout_height="match_parent" @@ -101,4 +102,4 @@ android:src="@drawable/ic_search_grey" /> </FrameLayout> -</FrameLayout>
\ No newline at end of file +</com.android.launcher3.AppsRecyclerViewContainer>
\ No newline at end of file diff --git a/res/layout/apps_prediction_bar_icon_view.xml b/res/layout/apps_prediction_bar_icon_view.xml index 4a6f1574b..1e75d14b6 100644 --- a/res/layout/apps_prediction_bar_icon_view.xml +++ b/res/layout/apps_prediction_bar_icon_view.xml @@ -24,6 +24,5 @@ android:layout_weight="1" android:focusable="true" android:background="@drawable/focusable_view_bg" - launcher:deferShadowGeneration="true" launcher:iconDisplay="all_apps" /> |