Commit 8b3d6c9c authored by Geoffrey Métais's avatar Geoffrey Métais

Upgrade appcompat for compile.sh builds

parent 6c78ce32
......@@ -24,7 +24,8 @@
<!-- Icons come first in the layout, since their placement doesn't depend on
the placement of the text views. -->
<ImageView android:id="@android:id/icon1"
<android.support.v7.internal.widget.TintImageView
android:id="@android:id/icon1"
android:layout_width="@dimen/abc_dropdownitem_icon_width"
android:layout_height="48dip"
android:scaleType="centerInside"
......@@ -33,7 +34,8 @@
android:visibility="invisible"
style="@style/RtlOverlay.Widget.AppCompat.Search.DropDown.Icon1" />
<ImageView android:id="@+id/edit_query"
<android.support.v7.internal.widget.TintImageView
android:id="@+id/edit_query"
android:layout_width="48dip"
android:layout_height="48dip"
android:scaleType="centerInside"
......@@ -43,7 +45,8 @@
android:visibility="gone"
style="@style/RtlOverlay.Widget.AppCompat.Search.DropDown.Query" />
<ImageView android:id="@id/android:icon2"
<android.support.v7.internal.widget.TintImageView
android:id="@id/android:icon2"
android:layout_width="48dip"
android:layout_height="48dip"
android:scaleType="centerInside"
......
......@@ -26,7 +26,7 @@
<string name="abc_searchview_description_query" msgid="2550479030709304392">"Søgeforespørgsel"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"Ryd forespørgslen"</string>
<string name="abc_searchview_description_submit" msgid="8928215447528550784">"Indsend forespørgslen"</string>
<string name="abc_searchview_description_voice" msgid="893419373245838918">"Stemmesøgning"</string>
<string name="abc_searchview_description_voice" msgid="893419373245838918">"Talesøgning"</string>
<string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"Vælg en app"</string>
<string name="abc_activity_chooser_view_see_all" msgid="7468859129482906941">"Se alle"</string>
<string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"Del med %s"</string>
......
......@@ -17,6 +17,20 @@
<resources>
<style name="Base.TextAppearance.AppCompat.Title.Inverse">
<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
<item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
</style>
<style name="Base.TextAppearance.AppCompat.Subhead.Inverse">
<item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
<item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
</style>
<!-- Deprecated text styles -->
<style name="Base.TextAppearance.AppCompat.Inverse">
......
......@@ -724,13 +724,10 @@
view with a theme override will inherit the themed context. -->
<attr name="theme" format="reference" />
<attr name="buttonGravity">
<!-- Push object to the top of its container, not changing its size. -->
<flag name="top" value="0x30" />
<!-- Push object to the bottom of its container, not changing its size. -->
<flag name="bottom" value="0x50" />
</attr>
<!-- Icon drawable to use for the collapse button. -->
<attr name="collapseIcon" format="reference" />
<!-- Text to set as the content description for the collapse button. -->
<attr name="collapseContentDescription" format="string" />
<!-- Reference to a theme that should be used to inflate popups
shown by widgets in the toolbar. -->
<attr name="popupTheme" />
......
......@@ -24,6 +24,9 @@
<!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
<string name="abc_action_menu_overflow_description">More options</string>
<!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
<string name="abc_toolbar_collapse_description">Collapse</string>
<!-- Formatting string for describing the action bar's title/home/up affordance.
This is a single tappable "button" that includes the app icon, the Up indicator
(usually a "<" chevron) and the window title text.
......
......@@ -36,9 +36,6 @@
<item name="actionButtonStyle">@style/Widget.AppCompat.ActionButton</item>
<item name="actionOverflowButtonStyle">@style/Widget.AppCompat.ActionButton.Overflow</item>
<item name="progressBarStyle">@style/Widget.AppCompat.ProgressBar.Horizontal</item>
<item name="indeterminateProgressStyle">@style/Widget.AppCompat.ProgressBar</item>
<item name="android:gravity">center_vertical</item>
<item name="elevation">8dp</item>
<item name="popupTheme">?attr/actionBarPopupTheme</item>
......@@ -312,8 +309,8 @@
<item name="android:minHeight">?attr/actionBarSize</item>
<item name="titleMargins">4dp</item>
<item name="maxButtonHeight">56dp</item>
<item name="buttonGravity">top</item>
<item name="collapseIcon">?attr/homeAsUpIndicator</item>
<item name="collapseContentDescription">@string/abc_toolbar_collapse_description</item>
<item name="contentInsetStart">16dp</item>
</style>
......
......@@ -58,8 +58,6 @@
<style name="Base.TextAppearance.AppCompat.Title.Inverse">
<item name="android:textColor">?android:attr/textColorPrimaryInverse</item>
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
<item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
</style>
<style name="Base.TextAppearance.AppCompat.Subhead">
......@@ -70,8 +68,6 @@
<style name="Base.TextAppearance.AppCompat.Subhead.Inverse">
<item name="android:textColor">?android:attr/textColorSecondaryInverse</item>
<item name="android:textColorHint">?android:attr/textColorHintInverse</item>
<item name="android:textColorHighlight">?android:attr/textColorHighlightInverse</item>
<item name="android:textColorLink">?android:attr/textColorLinkInverse</item>
</style>
<style name="Base.TextAppearance.AppCompat.Body2">
......
......@@ -47,7 +47,7 @@
<item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:textColorHint">@color/hint_foreground_material_dark</item>
<item name="android:textColorHintInverse">@color/hint_foreground_material_light</item>
<item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>m>
<item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>
<item name="android:textColorLink">@color/link_text_material_dark</item>
<!-- Text styles -->
......@@ -138,7 +138,7 @@
<item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:textColorHint">@color/hint_foreground_material_dark</item>
<item name="android:textColorHintInverse">@color/hint_foreground_material_light</item>
<item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>m>
<item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>
<item name="android:textColorLink">@color/link_text_material_dark</item>
<!-- Text styles -->
......@@ -589,7 +589,7 @@
<item name="android:textColorTertiaryInverse">@color/abc_secondary_text_material_light</item>
<item name="android:textColorHint">@color/hint_foreground_material_dark</item>
<item name="android:textColorHintInverse">@color/hint_foreground_material_light</item>
<item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>m>
<item name="android:textColorHighlight">@color/highlighted_text_material_dark</item>
<item name="android:textColorLink">@color/link_text_material_dark</item>
<!-- Action Bar styles -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment