summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-12-05 16:44:38 -0800
committerAdam Powell <adamp@google.com>2010-12-05 16:44:38 -0800
commit3f7f7ac30af6ea572aca44df91363cff7fcd9fef (patch)
treee6bd6a0935d20e3a212014730e91bbee3e1663b1 /core/res
parent6bc926bbb66776e165c669009232b11793e1146f (diff)
downloadframeworks_base-3f7f7ac30af6ea572aca44df91363cff7fcd9fef.zip
frameworks_base-3f7f7ac30af6ea572aca44df91363cff7fcd9fef.tar.gz
frameworks_base-3f7f7ac30af6ea572aca44df91363cff7fcd9fef.tar.bz2
Add dividers to action bar navigation. Lighter dividers for holo themes.
Change-Id: I879dbd815a891fe5db20678b674a9cee63a5e1ae
Diffstat (limited to 'core/res')
-rwxr-xr-xcore/res/res/values/attrs.xml3
-rw-r--r--core/res/res/values/public.xml1
-rw-r--r--core/res/res/values/styles.xml4
-rw-r--r--core/res/res/values/themes.xml8
4 files changed, 12 insertions, 4 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 78465cf..4d35b94 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -4542,6 +4542,9 @@
<attr name="indeterminateProgressStyle" format="reference" />
<!-- Specifies the horizontal padding on either end for an embedded progress bar. -->
<attr name="progressBarPadding" format="dimension" />
+ <!-- Specifies padding that should be applied to the left and right sides of
+ system-provided items in the bar. -->
+ <attr name="itemPadding" format="dimension" />
</declare-styleable>
<declare-styleable name="ActionMode">
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 63097c1..5941b52 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1396,6 +1396,7 @@
<public type="attr" name="dividerPadding" />
<public type="attr" name="borderlessButtonStyle" />
<public type="attr" name="dividerHorizontal" />
+ <public type="attr" name="itemPadding" />
<public type="anim" name="animator_fade_in" />
<public type="anim" name="animator_fade_out" />
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index e364418..d13af31 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -1599,6 +1599,9 @@
</style>
<style name="Widget.Holo.ActionBarView_TabBar" parent="Widget.ActionBarView_TabBar">
+ <item name="divider">?android:attr/dividerVertical</item>
+ <item name="showDividers">beginning|end</item>
+ <item name="dividerPadding">8dip</item>
</style>
<style name="Widget.Holo.ActionBarView_TabText" parent="Widget.ActionBarView_TabText">
@@ -1624,6 +1627,7 @@
<item name="android:progressBarStyle">@android:style/Widget.Holo.ProgressBar.Horizontal</item>
<item name="android:indeterminateProgressStyle">@android:style/Widget.Holo.ProgressBar</item>
<item name="android:progressBarPadding">32dip</item>
+ <item name="android:itemPadding">8dip</item>
</style>
<style name="Widget.Holo.CompoundButton.Switch">
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 9c4e237..a44e8d4 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -900,8 +900,8 @@
<item name="actionBarStyle">@android:style/Widget.Holo.ActionBar</item>
<item name="actionBarSize">56dip</item>
- <item name="dividerVertical">@drawable/divider_vertical_holo_dark</item>
- <item name="dividerHorizontal">@drawable/divider_vertical_holo_dark</item>
+ <item name="dividerVertical">?android:attr/listDivider</item>
+ <item name="dividerHorizontal">?android:attr/listDivider</item>
<item name="buttonGroupStyle">@android:style/Widget.Holo.ButtonGroup</item>
<!-- SearchView attributes -->
@@ -1146,8 +1146,8 @@
<item name="actionBarStyle">@android:style/Widget.Holo.Light.ActionBar</item>
<item name="actionBarSize">56dip</item>
- <item name="dividerVertical">@drawable/divider_vertical_holo_light</item>
- <item name="dividerHorizontal">@drawable/divider_vertical_holo_light</item>
+ <item name="dividerVertical">?android:attr/listDivider</item>
+ <item name="dividerHorizontal">?android:attr/listDivider</item>
<item name="buttonGroupStyle">@android:style/Widget.Holo.Light.ButtonGroup</item>
<!-- SearchView attributes -->