diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-04-25 08:47:11 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-04-25 08:54:51 -0700 |
| commit | 020aae74d3aa9d63a2f0fd7298552487b66d9ef5 (patch) | |
| tree | 2a94c9ebb108258ec055de40bab7af2fc8086eaf /res/values/filtershow_values_attrs.xml | |
| parent | 0819a57868f0b68c9766a0115253912fb6d3c9e7 (diff) | |
| parent | 7873e5b0f4e97aaadbcbb9064f31fdba48405945 (diff) | |
| download | android_packages_apps_Snap-020aae74d3aa9d63a2f0fd7298552487b66d9ef5.tar.gz android_packages_apps_Snap-020aae74d3aa9d63a2f0fd7298552487b66d9ef5.tar.bz2 android_packages_apps_Snap-020aae74d3aa9d63a2f0fd7298552487b66d9ef5.zip | |
resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad
Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25
Diffstat (limited to 'res/values/filtershow_values_attrs.xml')
| -rw-r--r-- | res/values/filtershow_values_attrs.xml | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/res/values/filtershow_values_attrs.xml b/res/values/filtershow_values_attrs.xml index 67c645dd8..32a3a871b 100644 --- a/res/values/filtershow_values_attrs.xml +++ b/res/values/filtershow_values_attrs.xml @@ -19,4 +19,14 @@ <attr name="android:text"/> <attr name="android:textColor"/> </declare-styleable> + <declare-styleable name="CenteredLinearLayout"> + <attr name="max_width" format="dimension" /> + </declare-styleable> + <declare-styleable name="StatePanelTrack"> + <attr name="elemSize" format="dimension" /> + <attr name="elemEndSize" format="dimension" /> + </declare-styleable> + <declare-styleable name="CategoryTrack"> + <attr name="iconSize" format="dimension" /> + </declare-styleable> </resources>
\ No newline at end of file |