Skip to content

Commit

Permalink
Update appcompat module to support library version 19.1
Browse files Browse the repository at this point in the history
  • Loading branch information
vishalduggal committed Apr 16, 2014
1 parent c7708d3 commit 3f3818e
Show file tree
Hide file tree
Showing 88 changed files with 339 additions and 3 deletions.
Binary file modified android/modules/appcompat/lib/android-support-v4.jar
Binary file not shown.
Binary file modified android/modules/appcompat/lib/android-support-v7-appcompat.jar
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions android/modules/appcompat/res/layout-v11/abc_simple_decor.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<android.support.v7.internal.widget.NativeActionModeAwareLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_bar_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:fitsSystemWindows="true">

<FrameLayout
android:id="@id/action_bar_activity_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foreground="?android:attr/windowContentOverlay"/>

</android.support.v7.internal.widget.NativeActionModeAwareLayout>
31 changes: 31 additions & 0 deletions android/modules/appcompat/res/layout/abc_simple_decor.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/action_bar_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:fitsSystemWindows="true">

<FrameLayout
android:id="@id/action_bar_activity_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:foreground="?android:attr/windowContentOverlay"/>

</LinearLayout>
2 changes: 1 addition & 1 deletion android/modules/appcompat/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
<string name="abc_searchview_description_voice" msgid="893419373245838918">"البحث الصوتي"</string>
<string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"اختيار تطبيق"</string>
<string name="abc_activity_chooser_view_see_all" msgid="7468859129482906941">"عرض الكل"</string>
<string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"مشاركة مع %s"</string>
<string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"مشاركة مع %s"</string>
<string name="abc_shareactionprovider_share_with" msgid="3421042268587513524">"مشاركة مع"</string>
</resources>
2 changes: 1 addition & 1 deletion android/modules/appcompat/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
<string name="abc_searchview_description_voice" msgid="893419373245838918">"جستجوی شفاهی"</string>
<string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"انتخاب برنامه"</string>
<string name="abc_activity_chooser_view_see_all" msgid="7468859129482906941">"مشاهده همه"</string>
<string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"اشتراک‌گذاری با %s"</string>
<string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"اشتراک‌گذاری با %s"</string>
<string name="abc_shareactionprovider_share_with" msgid="3421042268587513524">"اشتراک‌گذاری با"</string>
</resources>
2 changes: 1 addition & 1 deletion android/modules/appcompat/res/values-iw/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
<string name="abc_searchview_description_voice" msgid="893419373245838918">"חיפוש קולי"</string>
<string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"בחר אפליקציה"</string>
<string name="abc_activity_chooser_view_see_all" msgid="7468859129482906941">"ראה הכול"</string>
<string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"שתף עם %s"</string>
<string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"שתף עם %s"</string>
<string name="abc_shareactionprovider_share_with" msgid="3421042268587513524">"שתף עם"</string>
</resources>
25 changes: 25 additions & 0 deletions android/modules/appcompat/res/values-large-v14/themes_base.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<resources>

<style name="Theme.Base.AppCompat.DialogWhenLarge"
parent="Theme.Base.AppCompat.DialogWhenLarge.Base" />

<style name="Theme.Base.AppCompat.Light.DialogWhenLarge"
parent="Theme.Base.AppCompat.Light.DialogWhenLarge.Base" />

</resources>
13 changes: 13 additions & 0 deletions android/modules/appcompat/res/values-large/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,17 @@
showAsAction="ifRoom" items can fit. "always" items can override this. -->
<integer name="abc_max_action_buttons">4</integer>

<!-- The platform's desired fixed width for a dialog along the major axis
(the screen is in landscape). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_width_major">60%</item>
<!-- The platform's desired fixed width for a dialog along the minor axis
(the screen is in portrait). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_width_minor">90%</item>
<!-- The platform's desired fixed height for a dialog along the major axis
(the screen is in portrait). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_height_major">60%</item>
<!-- The platform's desired fixed height for a dialog along the minor axis
(the screen is in landscape). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_height_minor">90%</item>

</resources>
25 changes: 25 additions & 0 deletions android/modules/appcompat/res/values-large/themes_base.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->

<resources>

<style name="Theme.Base.AppCompat.DialogWhenLarge"
parent="Theme.Base.AppCompat.Dialog.FixedSize" />

<style name="Theme.Base.AppCompat.Light.DialogWhenLarge"
parent="Theme.Base.AppCompat.Dialog.Light.FixedSize" />

</resources>
41 changes: 41 additions & 0 deletions android/modules/appcompat/res/values-v11/themes_base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionBar">false</item>

<!--
A native Action Mode could be displayed (for text selection, etc) so we need to ensure
that it is positioned correctly, so we request windowActionModeOverlay so that it
displays over the compat Action Bar.
-->
<item name="android:windowActionModeOverlay">true</item>

<!-- Attributes populated from the framework to be read by apps -->
<item name="buttonBarStyle">?android:attr/buttonBarStyle</item>
<item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
Expand All @@ -43,6 +50,40 @@
<item name="android:windowNoTitle">true</item>
<item name="android:windowActionBar">false</item>

<!--
A native Action Mode could be displayed (for text selection, etc) so we need to ensure
that it is positioned correctly, so we request windowActionModeOverlay so that it
displays over the compat Action Bar.
-->
<item name="android:windowActionModeOverlay">true</item>

<!-- Attributes populated from the framework to be read by apps -->
<item name="buttonBarStyle">?android:attr/buttonBarStyle</item>
<item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
</style>

<style name="Theme.Base.AppCompat.Dialog.FixedSize" parent="android:Theme.Holo.Dialog">
<item name="windowFixedWidthMajor">@dimen/dialog_fixed_width_major</item>
<item name="windowFixedWidthMinor">@dimen/dialog_fixed_width_minor</item>
<item name="windowFixedHeightMajor">@dimen/dialog_fixed_height_major</item>
<item name="windowFixedHeightMinor">@dimen/dialog_fixed_height_minor</item>
<item name="windowActionBar">false</item>

<!-- Attributes populated from the framework to be read by apps -->
<item name="buttonBarStyle">?android:attr/buttonBarStyle</item>
<item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
</style>

<style name="Theme.Base.AppCompat.Dialog.Light.FixedSize"
parent="android:Theme.Holo.Light.Dialog">
<item name="windowFixedWidthMajor">@dimen/dialog_fixed_width_major</item>
<item name="windowFixedWidthMinor">@dimen/dialog_fixed_width_minor</item>
<item name="windowFixedHeightMajor">@dimen/dialog_fixed_height_major</item>
<item name="windowFixedHeightMinor">@dimen/dialog_fixed_height_minor</item>
<item name="windowActionBar">false</item>

<!-- Attributes populated from the framework to be read by apps -->
<item name="buttonBarStyle">?android:attr/buttonBarStyle</item>
<item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
Expand Down
65 changes: 65 additions & 0 deletions android/modules/appcompat/res/values-v14/themes_base.xml
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,69 @@
<item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
</style>

<style name="Theme.Base.AppCompat.DialogWhenLarge"
parent="Theme.Base.AppCompat.DialogWhenLarge.Base" />

<style name="Theme.Base.AppCompat.Light.DialogWhenLarge"
parent="Theme.Base.AppCompat.Light.DialogWhenLarge.Base" />

<!--
As we have defined the theme in values-large (for compat) and values-large takes precedence
over values-v14, we need to reset back to the Holo parent in values-large-v14. As the themes
in values-v14 & values-large-v14 are exactly the same, these "double base" themes can be
inherited from in both values-v14 and values-large-v14.
-->

<style name="Theme.Base.AppCompat.DialogWhenLarge.Base"
parent="android:Theme.Holo.DialogWhenLarge">
<!-- Copy system flag values for our use -->
<item name="windowActionBar">?android:attr/windowActionBar</item>
<item name="actionBarSize">?android:attr/actionBarSize</item>
<item name="actionBarItemBackground">?android:attr/actionBarItemBackground</item>
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
<item name="actionButtonStyle">?android:attr/actionButtonStyle</item>
<item name="dividerVertical">?android:attr/dividerVertical</item>
<item name="dividerHorizontal">?android:attr/dividerHorizontal</item>
<item name="actionBarWidgetTheme">@null</item>
<item name="android:actionBarWidgetTheme">?attr/actionBarWidgetTheme</item>

<!-- Required for use of support_simple_spinner_dropdown_item.xml -->
<item name="listPreferredItemHeight">?android:attr/listPreferredItemHeight</item>
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
<item name="listPreferredItemHeightLarge">?android:attr/listPreferredItemHeightLarge</item>
<item name="listPreferredItemPaddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
<item name="listPreferredItemPaddingRight">?android:attr/listPreferredItemPaddingRight
</item>

<!-- Attributes populated from the framework to be read by apps -->
<item name="buttonBarStyle">?android:attr/buttonBarStyle</item>
<item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
</style>

<style name="Theme.Base.AppCompat.Light.DialogWhenLarge.Base"
parent="android:Theme.Holo.Light.DialogWhenLarge">
<!-- Copy system flag values for our use -->
<item name="windowActionBar">?android:attr/windowActionBar</item>
<item name="actionBarSize">?android:attr/actionBarSize</item>
<item name="actionBarItemBackground">?android:attr/actionBarItemBackground</item>
<item name="selectableItemBackground">?android:attr/selectableItemBackground</item>
<item name="actionButtonStyle">?android:attr/actionButtonStyle</item>
<item name="dividerVertical">?android:attr/dividerVertical</item>
<item name="dividerHorizontal">?android:attr/dividerHorizontal</item>
<item name="actionBarWidgetTheme">@null</item>
<item name="android:actionBarWidgetTheme">?attr/actionBarWidgetTheme</item>

<!-- Required for use of support_simple_spinner_dropdown_item.xml -->
<item name="listPreferredItemHeight">?android:attr/listPreferredItemHeight</item>
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
<item name="listPreferredItemHeightLarge">?android:attr/listPreferredItemHeightLarge</item>
<item name="listPreferredItemPaddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
<item name="listPreferredItemPaddingRight">?android:attr/listPreferredItemPaddingRight
</item>

<!-- Attributes populated from the framework to be read by apps -->
<item name="buttonBarStyle">?android:attr/buttonBarStyle</item>
<item name="buttonBarButtonStyle">?android:attr/buttonBarButtonStyle</item>
</style>

</resources>
13 changes: 13 additions & 0 deletions android/modules/appcompat/res/values-xlarge/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,17 @@
<!-- Minimum width of the search view text entry area. -->
<dimen name="abc_search_view_text_min_width">192dip</dimen>

<!-- The platform's desired fixed width for a dialog along the major axis
(the screen is in landscape). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_width_major">50%</item>
<!-- The platform's desired fixed width for a dialog along the minor axis
(the screen is in portrait). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_width_minor">70%</item>
<!-- The platform's desired fixed height for a dialog along the major axis
(the screen is in portrait). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_height_major">60%</item>
<!-- The platform's desired fixed height for a dialog along the minor axis
(the screen is in landscape). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_height_minor">90%</item>

</resources>
19 changes: 19 additions & 0 deletions android/modules/appcompat/res/values/attrs.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,25 @@
<attr name="windowActionBar" format="boolean"/>
<attr name="windowActionBarOverlay" format="boolean"/>
<attr name="windowSplitActionBar" format="boolean" />

<!-- A fixed width for the window along the major axis of the screen,
that is, when in landscape. Can be either an absolute dimension
or a fraction of the screen size in that dimension. -->
<attr name="windowFixedWidthMajor" format="dimension|fraction" />
<!-- A fixed height for the window along the minor axis of the screen,
that is, when in landscape. Can be either an absolute dimension
or a fraction of the screen size in that dimension. -->
<attr name="windowFixedHeightMinor" format="dimension|fraction" />

<!-- A fixed width for the window along the minor axis of the screen,
that is, when in portrait. Can be either an absolute dimension
or a fraction of the screen size in that dimension. -->
<attr name="windowFixedWidthMinor" format="dimension|fraction" />
<!-- A fixed height for the window along the major axis of the screen,
that is, when in portrait. Can be either an absolute dimension
or a fraction of the screen size in that dimension. -->
<attr name="windowFixedHeightMajor" format="dimension|fraction" />

</declare-styleable>

<!-- ============================================ -->
Expand Down
14 changes: 14 additions & 0 deletions android/modules/appcompat/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,18 @@
<!-- Width of the icon in a dropdown list -->
<dimen name="abc_dropdownitem_icon_width">32dip</dimen>


<!-- The platform's desired fixed width for a dialog along the major axis
(the screen is in landscape). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_width_major">320dp</item>
<!-- The platform's desired fixed width for a dialog along the minor axis
(the screen is in portrait). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_width_minor">320dp</item>
<!-- The platform's desired fixed height for a dialog along the major axis
(the screen is in portrait). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_height_major">80%</item>
<!-- The platform's desired fixed height for a dialog along the minor axis
(the screen is in landscape). This may be either a fraction or a dimension.-->
<item type="dimen" name="dialog_fixed_height_minor">100%</item>

</resources>
7 changes: 7 additions & 0 deletions android/modules/appcompat/res/values/themes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,13 @@

</style>

<style name="Theme.AppCompat.DialogWhenLarge"
parent="Theme.Base.AppCompat.DialogWhenLarge">
</style>

<style name="Theme.AppCompat.Light.DialogWhenLarge"
parent="Theme.Base.AppCompat.Light.DialogWhenLarge">
</style>

<!-- Menu/item attributes -->
<style name="Theme.AppCompat.CompactMenu" parent="Theme.AppCompat.Base.CompactMenu">
Expand Down

0 comments on commit 3f3818e

Please sign in to comment.