diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2017-05-17 21:10:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-17 21:10:34 +0000 |
| commit | 233fbd70595b83cf254224866cc75c92dc545e92 (patch) | |
| tree | 5810ed834e8ac866b708151455f3cbaab3ca0b38 /res | |
| parent | 3148d486e45f1a27caa8a091e51e9ae7095baeb9 (diff) | |
| parent | 8b6ac00a1bd9ba5080e1fd5d3b5021d98711db88 (diff) | |
| download | android_packages_apps_Trebuchet-233fbd70595b83cf254224866cc75c92dc545e92.tar.gz android_packages_apps_Trebuchet-233fbd70595b83cf254224866cc75c92dc545e92.tar.bz2 android_packages_apps_Trebuchet-233fbd70595b83cf254224866cc75c92dc545e92.zip | |
Adding an option to change the shadow size
am: 8b6ac00a1b
Change-Id: I6ebafb3b81f486adeb510bc021638dd266ca1234
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable-v24/ic_info_shadow.xml | 3 | ||||
| -rw-r--r-- | res/drawable-v24/ic_remove_shadow.xml | 3 | ||||
| -rw-r--r-- | res/drawable-v24/ic_uninstall_shadow.xml | 3 | ||||
| -rw-r--r-- | res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/res/drawable-v24/ic_info_shadow.xml b/res/drawable-v24/ic_info_shadow.xml index 9bd7e16d0..1fe2c46b4 100644 --- a/res/drawable-v24/ic_info_shadow.xml +++ b/res/drawable-v24/ic_info_shadow.xml @@ -15,4 +15,5 @@ --> <com.android.launcher3.graphics.ShadowDrawable xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_info_no_shadow" /> + android:src="@drawable/ic_info_no_shadow" + android:elevation="@dimen/drop_target_shadow_elevation" /> diff --git a/res/drawable-v24/ic_remove_shadow.xml b/res/drawable-v24/ic_remove_shadow.xml index 16a630e5f..48abc10b3 100644 --- a/res/drawable-v24/ic_remove_shadow.xml +++ b/res/drawable-v24/ic_remove_shadow.xml @@ -15,4 +15,5 @@ --> <com.android.launcher3.graphics.ShadowDrawable xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_remove_no_shadow" /> + android:src="@drawable/ic_remove_no_shadow" + android:elevation="@dimen/drop_target_shadow_elevation" /> diff --git a/res/drawable-v24/ic_uninstall_shadow.xml b/res/drawable-v24/ic_uninstall_shadow.xml index 2532157ab..b441b0e7b 100644 --- a/res/drawable-v24/ic_uninstall_shadow.xml +++ b/res/drawable-v24/ic_uninstall_shadow.xml @@ -15,4 +15,5 @@ --> <com.android.launcher3.graphics.ShadowDrawable xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_uninstall_no_shadow" /> + android:src="@drawable/ic_uninstall_no_shadow" + android:elevation="@dimen/drop_target_shadow_elevation" /> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 18759f817..807d08af2 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -114,5 +114,6 @@ <declare-styleable name="ShadowDrawable"> <attr name="android:src" /> <attr name="android:shadowColor" /> + <attr name="android:elevation" /> </declare-styleable> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b0f64a604..958cb6bc8 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -104,6 +104,7 @@ <!-- Drag padding to add to the bottom of drop targets --> <dimen name="drop_target_drag_padding">14dp</dimen> <dimen name="drop_target_text_size">14sp</dimen> + <dimen name="drop_target_shadow_elevation">2dp</dimen> <!-- the distance an icon must be dragged before button drop targets accept it --> <dimen name="drag_distanceThreshold">30dp</dimen> @@ -138,7 +139,6 @@ <dimen name="blur_size_medium_outline">2dp</dimen> <dimen name="blur_size_click_shadow">4dp</dimen> <dimen name="click_shadow_high_shift">2dp</dimen> - <dimen name="drawable_shadow_size">4dp</dimen> <!-- Pending widget --> <dimen name="pending_widget_min_padding">8dp</dimen> |