diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-23 17:08:47 -0700 |
| commit | 680c92febe88260b74f101838a9734b8e10a704c (patch) | |
| tree | e3294c3b2b32cd3532fa9b239326b1aaaa79fc40 /res/layout/all_apps_button.xml | |
| parent | 494d2237b8d7b892902604c18098127e77372509 (diff) | |
| parent | 13ef17a37e683b8ad5800e9f542b411180fbec2f (diff) | |
| download | android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.gz android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.tar.bz2 android_packages_apps_Trebuchet-680c92febe88260b74f101838a9734b8e10a704c.zip | |
resolved conflicts for merge of 13ef17a3 to cw-e-dev
b/22609402
Change-Id: I3753db1f922923a6b462fa75a5c0d826e0413f95
Diffstat (limited to 'res/layout/all_apps_button.xml')
| -rw-r--r-- | res/layout/all_apps_button.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/layout/all_apps_button.xml b/res/layout/all_apps_button.xml index 9d6d82bb2..68cc10932 100644 --- a/res/layout/all_apps_button.xml +++ b/res/layout/all_apps_button.xml @@ -15,5 +15,5 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/WorkspaceIcon" + style="@style/Icon" android:focusable="true" /> |