diff options
author | Ying Wang <wangying@google.com> | 2015-03-18 16:20:57 -0700 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2015-03-18 16:22:37 -0700 |
commit | 987de844f9e325ec251885c107c74045e9a46e02 (patch) | |
tree | 41a8d15e914bc85e359a2f76ce699d9eb2c90643 /current | |
parent | 925ed8d28c1e8fa6ec195ba7def3bf69b836d79a (diff) | |
download | prebuilts_sdk-987de844f9e325ec251885c107c74045e9a46e02.zip prebuilts_sdk-987de844f9e325ec251885c107c74045e9a46e02.tar.gz prebuilts_sdk-987de844f9e325ec251885c107c74045e9a46e02.tar.bz2 |
[NOT NOT MERGE] Drop SDK as of AAY77C #1797412 on master-release.
This fixes the broken apps build in master.
Bug: 19792332
Change-Id: I56679cfb5d8ccc6a7ab479bebb6a5a94f59ef802
Diffstat (limited to 'current')
30 files changed, 256 insertions, 1 deletions
diff --git a/current/android.jar b/current/android.jar Binary files differindex 81c4369..7c212a9 100644 --- a/current/android.jar +++ b/current/android.jar diff --git a/current/framework.aidl b/current/framework.aidl index 9d89828..d1b3d97 100644 --- a/current/framework.aidl +++ b/current/framework.aidl @@ -106,6 +106,8 @@ parcelable android.service.notification.StatusBarNotification; parcelable android.service.chooser.ChooserTarget; parcelable android.speech.tts.Voice; parcelable android.app.usage.UsageEvents; +parcelable android.app.AssistStructure; +parcelable android.app.AssistContent; parcelable android.app.Notification; parcelable android.app.WallpaperInfo; parcelable android.app.AppOpsManager.PackageOps; @@ -113,6 +115,7 @@ parcelable android.app.ActivityManager.RecentTaskInfo; parcelable android.app.PendingIntent; parcelable android.app.AlarmManager.AlarmClockInfo; parcelable android.app.SearchableInfo; +parcelable android.app.VoiceInteractor.PickOptionRequest.Option; parcelable android.app.job.JobParameters; parcelable android.app.job.JobInfo; parcelable android.appwidget.AppWidgetProviderInfo; diff --git a/current/support/annotations/android-support-annotations.jar b/current/support/annotations/android-support-annotations.jar Binary files differindex 25dcd48..ecbe66f 100644 --- a/current/support/annotations/android-support-annotations.jar +++ b/current/support/annotations/android-support-annotations.jar diff --git a/current/support/design/libs/android-support-design.jar b/current/support/design/libs/android-support-design.jar Binary files differindex 6e69c67..0aa5add 100644 --- a/current/support/design/libs/android-support-design.jar +++ b/current/support/design/libs/android-support-design.jar diff --git a/current/support/design/res/anim/snackbar_in.xml b/current/support/design/res/anim/snackbar_in.xml new file mode 100644 index 0000000..a40524c --- /dev/null +++ b/current/support/design/res/anim/snackbar_in.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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. +--> + +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromYDelta="100%" + android:toYDelta="0"/> diff --git a/current/support/design/res/anim/snackbar_out.xml b/current/support/design/res/anim/snackbar_out.xml new file mode 100644 index 0000000..eb55cc0 --- /dev/null +++ b/current/support/design/res/anim/snackbar_out.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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. +--> + +<translate xmlns:android="http://schemas.android.com/apk/res/android" + android:fromYDelta="0" + android:toYDelta="100%"/>
\ No newline at end of file diff --git a/current/support/design/res/drawable/snackbar_background.xml b/current/support/design/res/drawable/snackbar_background.xml new file mode 100644 index 0000000..739b516 --- /dev/null +++ b/current/support/design/res/drawable/snackbar_background.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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. + --> + +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <corners android:radius="@dimen/snackbar_background_corner_radius"/> + <solid android:color="@color/snackbar_background_color"/> +</shape>
\ No newline at end of file diff --git a/current/support/design/res/layout-sw600dp/layout_snackbar.xml b/current/support/design/res/layout-sw600dp/layout_snackbar.xml new file mode 100644 index 0000000..6605408 --- /dev/null +++ b/current/support/design/res/layout-sw600dp/layout_snackbar.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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. +--> + +<view xmlns:android="http://schemas.android.com/apk/res/android" + class="android.support.design.widget.Snackbar$SnackbarLayout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom|center_vertical" + style="@style/Widget.Design.Snackbar" />
\ No newline at end of file diff --git a/current/support/design/res/layout/layout_snackbar.xml b/current/support/design/res/layout/layout_snackbar.xml new file mode 100644 index 0000000..604aafc --- /dev/null +++ b/current/support/design/res/layout/layout_snackbar.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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. +--> + +<view xmlns:android="http://schemas.android.com/apk/res/android" + class="android.support.design.widget.Snackbar$SnackbarLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + style="@style/Widget.Design.Snackbar" />
\ No newline at end of file diff --git a/current/support/design/res/layout/layout_snackbar_include.xml b/current/support/design/res/layout/layout_snackbar_include.xml new file mode 100644 index 0000000..0cf2002 --- /dev/null +++ b/current/support/design/res/layout/layout_snackbar_include.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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. +--> + +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + + <TextView + android:id="@+id/snackbar_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="@dimen/snackbar_padding_vertical" + android:paddingBottom="@dimen/snackbar_padding_vertical" + android:paddingLeft="@dimen/snackbar_padding_horizontal" + android:paddingRight="@dimen/snackbar_padding_horizontal" + android:textAppearance="@style/TextAppearance.Design.Snackbar.Message" + android:maxLines="@integer/snackbar_text_max_lines" + android:layout_gravity="center_vertical|left|start" + android:ellipsize="end"/> + + <TextView + android:id="@+id/snackbar_action" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/snackbar_extra_spacing_horizontal" + android:layout_marginStart="@dimen/snackbar_extra_spacing_horizontal" + android:layout_gravity="center_vertical|right|end" + android:background="?attr/selectableItemBackground" + android:paddingTop="@dimen/snackbar_padding_vertical" + android:paddingBottom="@dimen/snackbar_padding_vertical" + android:paddingLeft="@dimen/snackbar_padding_horizontal" + android:paddingRight="@dimen/snackbar_padding_horizontal" + android:visibility="gone" + android:textAppearance="@style/TextAppearance.Design.Snackbar.Action"/> + +</merge>
\ No newline at end of file diff --git a/current/support/design/res/values-sw600dp/config.xml b/current/support/design/res/values-sw600dp/config.xml new file mode 100644 index 0000000..baac13b --- /dev/null +++ b/current/support/design/res/values-sw600dp/config.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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> + + <integer name="snackbar_text_max_lines">1</integer> + +</resources>
\ No newline at end of file diff --git a/current/support/design/res/values-sw600dp/dimens.xml b/current/support/design/res/values-sw600dp/dimens.xml index 2d966e6..37c3ff5 100644 --- a/current/support/design/res/values-sw600dp/dimens.xml +++ b/current/support/design/res/values-sw600dp/dimens.xml @@ -19,4 +19,11 @@ <dimen name="tab_min_width">160dp</dimen> + <dimen name="snackbar_min_width">320dp</dimen> + <dimen name="snackbar_max_width">576dp</dimen> + <dimen name="snackbar_padding_vertical_2lines">@dimen/snackbar_padding_vertical</dimen> + <dimen name="snackbar_extra_spacing_horizontal">24dp</dimen> + <dimen name="snackbar_background_corner_radius">2dp</dimen> + <dimen name="snackbar_action_inline_max_width">0dp</dimen> + </resources>
\ No newline at end of file diff --git a/current/support/design/res/values/attrs.xml b/current/support/design/res/values/attrs.xml index 62fb2cd..bf81b54 100644 --- a/current/support/design/res/values/attrs.xml +++ b/current/support/design/res/values/attrs.xml @@ -152,5 +152,10 @@ <attr name="errorTextAppearance" format="reference" /> </declare-styleable> + <declare-styleable name="SnackbarLayout"> + <attr name="android:maxWidth" /> + <attr name="maxActionInlineWidth" format="dimension" /> + </declare-styleable> + </resources> diff --git a/current/support/design/res/values/colors.xml b/current/support/design/res/values/colors.xml index c005c91..f46e0ce 100644 --- a/current/support/design/res/values/colors.xml +++ b/current/support/design/res/values/colors.xml @@ -26,4 +26,6 @@ <color name="error_color">#FFDD2C00</color> + <color name="snackbar_background_color">#323232</color> + </resources>
\ No newline at end of file diff --git a/current/support/design/res/values/config.xml b/current/support/design/res/values/config.xml new file mode 100644 index 0000000..2ff276a --- /dev/null +++ b/current/support/design/res/values/config.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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> + + <integer name="snackbar_text_max_lines">2</integer> + +</resources>
\ No newline at end of file diff --git a/current/support/design/res/values/dimens.xml b/current/support/design/res/values/dimens.xml index bb96119..23d9c0d 100644 --- a/current/support/design/res/values/dimens.xml +++ b/current/support/design/res/values/dimens.xml @@ -32,4 +32,21 @@ <dimen name="tab_min_width">72dp</dimen> <dimen name="tab_max_width">264dp</dimen> + <dimen name="snackbar_min_width">-1px</dimen> + <dimen name="snackbar_max_width">-1px</dimen> + <dimen name="snackbar_elevation">2dp</dimen> + <dimen name="snackbar_background_corner_radius">0dp</dimen> + + <dimen name="snackbar_padding_horizontal">12dp</dimen> + <dimen name="snackbar_padding_vertical">14dp</dimen> + <dimen name="snackbar_padding_vertical_2lines">24dp</dimen> + + <!-- Extra spacing between the action and message views --> + <dimen name="snackbar_extra_spacing_horizontal">0dp</dimen> + <!-- The maximum width for a Snackbar's inline action. If the view is width than this then + the Snackbar will change to vertical stacking --> + <dimen name="snackbar_action_inline_max_width">128dp</dimen> + + <dimen name="snackbar_text_size">14sp</dimen> + </resources> diff --git a/current/support/design/res/values/styles.xml b/current/support/design/res/values/styles.xml index e3ca35d..46e2144 100644 --- a/current/support/design/res/values/styles.xml +++ b/current/support/design/res/values/styles.xml @@ -72,5 +72,25 @@ <item name="android:textColor">@color/error_color</item> </style> + <style name="TextAppearance.Design.Snackbar.Message" parent="android:TextAppearance"> + <item name="android:textSize">@dimen/snackbar_text_size</item> + <item name="android:textColor">?android:textColorPrimary</item> + </style> + + <style name="TextAppearance.Design.Snackbar.Action" parent="TextAppearance.AppCompat.Button"> + <item name="android:textColor">?colorAccent</item> + </style> + + <style name="Widget.Design.Snackbar" parent="android:Widget"> + <item name="android:theme">@style/ThemeOverlay.AppCompat.Dark</item> + <item name="android:minWidth">@dimen/snackbar_min_width</item> + <item name="android:maxWidth">@dimen/snackbar_max_width</item> + <item name="android:background">@drawable/snackbar_background</item> + <item name="android:paddingLeft">@dimen/snackbar_padding_horizontal</item> + <item name="android:paddingRight">@dimen/snackbar_padding_horizontal</item> + <item name="android:elevation">@dimen/snackbar_elevation</item> + <item name="maxActionInlineWidth">@dimen/snackbar_action_inline_max_width</item> + </style> + </resources> diff --git a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar Binary files differindex c87c67f..2bbffe6 100644 --- a/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar +++ b/current/support/multidex/instrumentation/libs/android-support-multidex-instrumentation.jar diff --git a/current/support/multidex/library/libs/android-support-multidex.jar b/current/support/multidex/library/libs/android-support-multidex.jar Binary files differindex a4143b7..10b5d76 100644 --- a/current/support/multidex/library/libs/android-support-multidex.jar +++ b/current/support/multidex/library/libs/android-support-multidex.jar diff --git a/current/support/v13/android-support-v13.jar b/current/support/v13/android-support-v13.jar Binary files differindex fb915b3..0e8e32c 100644 --- a/current/support/v13/android-support-v13.jar +++ b/current/support/v13/android-support-v13.jar diff --git a/current/support/v17/leanback/libs/android-support-v17-leanback.jar b/current/support/v17/leanback/libs/android-support-v17-leanback.jar Binary files differindex 9310717..97dcbfd 100644 --- a/current/support/v17/leanback/libs/android-support-v17-leanback.jar +++ b/current/support/v17/leanback/libs/android-support-v17-leanback.jar diff --git a/current/support/v4/android-support-v4.jar b/current/support/v4/android-support-v4.jar Binary files differindex fbaff1d..b7dfec6 100644 --- a/current/support/v4/android-support-v4.jar +++ b/current/support/v4/android-support-v4.jar diff --git a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar Binary files differindex afd7d35..88ef246 100644 --- a/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar +++ b/current/support/v7/appcompat/libs/android-support-v7-appcompat.jar diff --git a/current/support/v7/appcompat/res/values-ro/strings.xml b/current/support/v7/appcompat/res/values-ro/strings.xml index 4c741f3..a69eacc 100644 --- a/current/support/v7/appcompat/res/values-ro/strings.xml +++ b/current/support/v7/appcompat/res/values-ro/strings.xml @@ -29,7 +29,7 @@ <string name="abc_searchview_description_clear" msgid="3691816814315814921">"Ștergeți interogarea"</string> <string name="abc_searchview_description_submit" msgid="8928215447528550784">"Trimiteți interogarea"</string> <string name="abc_searchview_description_voice" msgid="893419373245838918">"Căutare vocală"</string> - <string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"Alegeți o aplicaţie"</string> + <string name="abc_activitychooserview_choose_application" msgid="2031811694353399454">"Alegeți o aplicație"</string> <string name="abc_activity_chooser_view_see_all" msgid="7468859129482906941">"Afișați-le pe toate"</string> <string name="abc_shareactionprovider_share_with_application" msgid="7165123711973476752">"Trimiteți la %s"</string> <string name="abc_shareactionprovider_share_with" msgid="3421042268587513524">"Trimiteți la"</string> diff --git a/current/support/v7/cardview/libs/android-support-v7-cardview.jar b/current/support/v7/cardview/libs/android-support-v7-cardview.jar Binary files differindex 150a9f3..26f184e 100644 --- a/current/support/v7/cardview/libs/android-support-v7-cardview.jar +++ b/current/support/v7/cardview/libs/android-support-v7-cardview.jar diff --git a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar Binary files differindex 15e989a..97b60f6 100644 --- a/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar +++ b/current/support/v7/gridlayout/libs/android-support-v7-gridlayout.jar diff --git a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar Binary files differindex cea0b54..f5a5b1d 100644 --- a/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar +++ b/current/support/v7/mediarouter/libs/android-support-v7-mediarouter.jar diff --git a/current/support/v7/palette/libs/android-support-v7-palette.jar b/current/support/v7/palette/libs/android-support-v7-palette.jar Binary files differindex 958e811..f2256b2 100644 --- a/current/support/v7/palette/libs/android-support-v7-palette.jar +++ b/current/support/v7/palette/libs/android-support-v7-palette.jar diff --git a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar Binary files differindex 492419b..4b263e9 100644 --- a/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar +++ b/current/support/v7/recyclerview/libs/android-support-v7-recyclerview.jar diff --git a/current/uiautomator.jar b/current/uiautomator.jar Binary files differindex 084520b..4e14d9a 100644 --- a/current/uiautomator.jar +++ b/current/uiautomator.jar |