diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-10 12:26:23 -0800 |
|---|---|---|
| committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-10 12:27:51 -0800 |
| commit | 7c50b31f57e3e3ec1f433d243afe05554dcaf977 (patch) | |
| tree | b244d7b5cf1d0c7e753fb3f6751c4108cd87d0a5 /res/drawable | |
| parent | 323117ca37483c2adcd14b9969e2a36ea57a9d6a (diff) | |
| parent | 3826bab27ef3e7608aba112bd0f5ce2e7c3eac5b (diff) | |
| download | android_packages_apps_Trebuchet-7c50b31f57e3e3ec1f433d243afe05554dcaf977.tar.gz android_packages_apps_Trebuchet-7c50b31f57e3e3ec1f433d243afe05554dcaf977.tar.bz2 android_packages_apps_Trebuchet-7c50b31f57e3e3ec1f433d243afe05554dcaf977.zip | |
resolve merge conflicts of 3826bab27e to ub-launcher3-calgary.
Change-Id: I14ff2d67de4ba97628bdf651602724f9f4989173
Diffstat (limited to 'res/drawable')
| -rw-r--r-- | res/drawable/all_apps_search_bg.xml | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/res/drawable/all_apps_search_bg.xml b/res/drawable/all_apps_search_bg.xml index a09f88fd4..5a2c9e836 100644 --- a/res/drawable/all_apps_search_bg.xml +++ b/res/drawable/all_apps_search_bg.xml @@ -14,7 +14,25 @@ See the License for the specific language governing permissions and limitations under the License. --> -<inset xmlns:android="http://schemas.android.com/apk/res/android" - android:drawable="@drawable/quantum_panel" - android:insetTop="@dimen/container_bounds_minus_quantum_panel_padding_inset" - android:insetBottom="@dimen/container_bounds_minus_quantum_panel_padding_inset" />
\ No newline at end of file +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape android:shape="rectangle"> + <solid android:color="@color/quantum_panel_bg_color" /> + <corners + android:topLeftRadius="2dp" + android:topRightRadius="2dp" /> + </shape> + </item> + <item + android:top="@dimen/all_apps_search_bar_bg_overflow" + android:left="@dimen/all_apps_search_bar_bg_overflow" + android:right="@dimen/all_apps_search_bar_bg_overflow" + android:bottom="0dp"> + + <shape android:shape="rectangle"> + <stroke + android:width="@dimen/all_apps_search_bar_divider_width" + android:color="#1E000000"/> + </shape> + </item> +</layer-list>
\ No newline at end of file |