Skip to content

Commit

Permalink
[TIMOB-18905] Android: Update Appcompat to 22.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Ashraf A committed May 29, 2015
1 parent d37176b commit df8b514
Show file tree
Hide file tree
Showing 284 changed files with 740 additions and 871 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_accelerated="false" android:color="@color/background_material_dark" />
<item android:color="@android:color/transparent" />
<item android:color="@color/background_material_dark" />
</selector>
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,5 @@
-->

<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_accelerated="false" android:color="@color/background_material_light" />
<item android:color="@android:color/transparent" />
<item android:color="@color/background_material_light" />
</selector>
Binary file not shown.
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.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
limitations under the License.
-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:paddingMode="stack">
<item android:drawable="@drawable/abc_cab_background_internal_bg" />
<item android:drawable="@drawable/abc_cab_background_top_mtrl_alpha" />
</layer-list>
<!-- This is a dummy drawable so that we can refer to the drawable ID -->
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/white"/>
</shape>
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,15 @@
-->

<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:insetLeft="@dimen/abc_control_inset_material"
android:insetTop="@dimen/abc_control_inset_material"
android:insetBottom="@dimen/abc_control_inset_material"
android:insetRight="@dimen/abc_control_inset_material">
android:insetLeft="@dimen/abc_edit_text_inset_horizontal_material"
android:insetRight="@dimen/abc_edit_text_inset_horizontal_material"
android:insetTop="@dimen/abc_edit_text_inset_top_material"
android:insetBottom="@dimen/abc_edit_text_inset_bottom_material">

<selector>
<item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
<item android:state_enabled="true" android:state_activated="true" android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
<item android:state_enabled="true" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
<item android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
<item android:state_enabled="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
<item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/abc_textfield_default_mtrl_alpha"/>
<item android:drawable="@drawable/abc_textfield_activated_mtrl_alpha"/>
</selector>

</inset>
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,5 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:theme="?attr/actionBarTheme"
style="?attr/actionModeStyle"/>
50 changes: 46 additions & 4 deletions android/modules/appcompat/res/layout/abc_activity_chooser_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,56 @@
** limitations under the License.
*/
-->
<android.support.v7.widget.LinearLayoutCompat
xmlns:android="http://schemas.android.com/apk/res/android"
<view xmlns:android="http://schemas.android.com/apk/res/android"
class="android.support.v7.internal.widget.ActivityChooserView$InnerLayout"
android:id="@+id/activity_chooser_view_content"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
style="?attr/activityChooserViewStyle">

<include layout="@layout/abc_activity_chooser_view_include" />
<FrameLayout
android:id="@+id/expand_activities_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:focusable="true"
android:addStatesFromChildren="true"
android:background="?attr/actionBarItemBackground">

</android.support.v7.widget.LinearLayoutCompat>
<ImageView android:id="@+id/image"
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_gravity="center"
android:layout_marginTop="2dip"
android:layout_marginBottom="2dip"
android:layout_marginLeft="12dip"
android:layout_marginRight="12dip"
android:scaleType="fitCenter"
android:adjustViewBounds="true" />

</FrameLayout>

<FrameLayout
android:id="@+id/default_activity_button"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:focusable="true"
android:addStatesFromChildren="true"
android:background="?attr/actionBarItemBackground">

<ImageView android:id="@+id/image"
android:layout_width="32dip"
android:layout_height="32dip"
android:layout_gravity="center"
android:layout_marginTop="2dip"
android:layout_marginBottom="2dip"
android:layout_marginLeft="12dip"
android:layout_marginRight="12dip"
android:scaleType="fitCenter"
android:adjustViewBounds="true" />

</FrameLayout>

</view>

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,4 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/expanded_menu"
android:layout_width="?attr/panelMenuListWidth"
android:layout_height="wrap_content"
android:background="?attr/panelBackground"/>
android:layout_height="wrap_content" />
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
android:theme="?attr/actionBarTheme"
style="?attr/actionModeStyle"/>

</android.support.v7.internal.widget.ActionBarContainer>
Expand Down
2 changes: 0 additions & 2 deletions android/modules/appcompat/res/values-af/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"Navigeer tuis"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"Navigeer op"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Nog opsies"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s, %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s, %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"Soek"</string>
<string name="abc_searchview_description_query" msgid="2550479030709304392">"Soeknavraag"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"Vee navraag uit"</string>
Expand Down
2 changes: 0 additions & 2 deletions android/modules/appcompat/res/values-am/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"ወደ መነሻ ይዳስሱ"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"ወደ ላይ ይዳስሱ"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"ተጨማሪ አማራጮች"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s፣ %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s፣ %2$s፣ %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"ፍለጋ"</string>
<string name="abc_searchview_description_query" msgid="2550479030709304392">"የፍለጋ ጥያቄ"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"መጠይቅ አጽዳ"</string>
Expand Down
2 changes: 0 additions & 2 deletions android/modules/appcompat/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"التنقل إلى الشاشة الرئيسية"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"التنقل إلى أعلى"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"خيارات إضافية"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s، %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s، %2$s، %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"بحث"</string>
<string name="abc_searchview_description_query" msgid="2550479030709304392">"طلب البحث"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"محو طلب البحث"</string>
Expand Down
2 changes: 0 additions & 2 deletions android/modules/appcompat/res/values-bg/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"Придвижване към „Начало“"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"Придвижване нагоре"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Още опции"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"„%1$s“ – %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"„%1$s“, „%2$s“ – %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"Търсене"</string>
<string name="abc_searchview_description_query" msgid="2550479030709304392">"Заявка за търсене"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"Изчистване на заявката"</string>
Expand Down
2 changes: 0 additions & 2 deletions android/modules/appcompat/res/values-bn-rBD/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"হোম এ নেভিগেট করুন"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"উপরের দিকে নেভিগেট করুন"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"আরো বিকল্প"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s, %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s, %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"অনুসন্ধান করুন"</string>
<string name="abc_searchview_description_query" msgid="2550479030709304392">"ক্যোয়ারী অনুসন্ধান করুন"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"ক্যোয়ারী সাফ করুন"</string>
Expand Down
2 changes: 0 additions & 2 deletions android/modules/appcompat/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"Navega a la pàgina d\'inici"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"Navega cap a dalt"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Més opcions"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s, %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s, %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"Cerca"</string>
<string name="abc_searchview_description_query" msgid="2550479030709304392">"Consulta de cerca"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"Esborra la consulta"</string>
Expand Down
2 changes: 0 additions & 2 deletions android/modules/appcompat/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"Přejít na plochu"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"Přejít nahoru"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Více možností"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s – %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s – %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"Hledat"</string>
<string name="abc_searchview_description_query" msgid="2550479030709304392">"Vyhledávací dotaz"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"Smazat dotaz"</string>
Expand Down
4 changes: 1 addition & 3 deletions android/modules/appcompat/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,11 @@
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"Naviger hjem"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"Naviger op"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Flere muligheder"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s, %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s, %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"Søg"</string>
<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">"Talesøgning"</string>
<string name="abc_searchview_description_voice" msgid="893419373245838918">"Stemmesø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>
Expand Down
2 changes: 0 additions & 2 deletions android/modules/appcompat/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"Zur Startseite"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"Nach oben"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Weitere Optionen"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s: %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s: %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"Suchen"</string>
<string name="abc_searchview_description_query" msgid="2550479030709304392">"Suchanfrage"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"Suchanfrage löschen"</string>
Expand Down
2 changes: 0 additions & 2 deletions android/modules/appcompat/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"Πλοήγηση στην αρχική σελίδα"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"Πλοήγηση προς τα επάνω"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"Περισσότερες επιλογές"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s, %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s, %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"Αναζήτηση"</string>
<string name="abc_searchview_description_query" msgid="2550479030709304392">"Ερώτημα αναζήτησης"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"Διαγραφή ερωτήματος"</string>
Expand Down
4 changes: 1 addition & 3 deletions android/modules/appcompat/res/values-en-rGB/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@

<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="abc_action_mode_done" msgid="4076576682505996667">"Done"</string>
<string name="abc_action_mode_done" msgid="4076576682505996667">"Finished"</string>
<string name="abc_action_bar_home_description" msgid="4600421777120114993">"Navigate home"</string>
<string name="abc_action_bar_up_description" msgid="1594238315039666878">"Navigate up"</string>
<string name="abc_action_menu_overflow_description" msgid="3588849162933574182">"More options"</string>
<string name="abc_action_bar_home_description_format" msgid="1397052879051804371">"%1$s, %2$s"</string>
<string name="abc_action_bar_home_subtitle_description_format" msgid="6623331958280229229">"%1$s, %2$s, %3$s"</string>
<string name="abc_searchview_description_search" msgid="8264924765203268293">"Search"</string>
<string name="abc_searchview_description_query" msgid="2550479030709304392">"Search query"</string>
<string name="abc_searchview_description_clear" msgid="3691816814315814921">"Clear query"</string>
Expand Down

0 comments on commit df8b514

Please sign in to comment.