Skip to content

Commit dc2155b

Browse files
omarismail94Android (Google) Code Review
authored andcommitted
Revert "Merge remote-tracking branch 'goog/androidx-platform-dev' into HEAD"
This reverts commit 917a43f. Reason for revert: Failing postsubmit as it relies on andorid-36.1, which is not in `androidx-platform-staging`'s prebuilts (and should not be as we don't want to risk adding unreleased SDKs) Change-Id: Ic7ac6d94be6d9a73c5563eefe399598b01bc460e
1 parent 917a43f commit dc2155b

416 files changed

Lines changed: 299 additions & 2806 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎autofill/autofill/src/androidTest/java/androidx/autofill/inline/v1/InlineSuggestionUiTest.java‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import android.content.res.ColorStateList;
3737
import android.graphics.Color;
3838
import android.graphics.Typeface;
39-
import android.graphics.drawable.Animatable;
4039
import android.graphics.drawable.Icon;
4140
import android.net.Uri;
4241
import android.view.LayoutInflater;
@@ -151,21 +150,6 @@ public void testRender_titleOnly_customStyle() {
151150
TestUtils.verifyTextSize(mContext, titleView, 30);
152151
}
153152

154-
@Test
155-
public void testRender_animatableIcon() {
156-
InlineSuggestionUi.Style style = mStyleBuilder.build();
157-
InlineSuggestionUi.Content content = InlineSuggestionUi.newContentBuilder(
158-
mAttributionIntent).setStartIcon(
159-
Icon.createWithResource(mContext,
160-
androidx.autofill.test.R.drawable.ic_animation)).build();
161-
View view = InlineSuggestionUi.render(mContext, content, style);
162-
addView(view);
163-
164-
verifyVisibility(false, false, true, false);
165-
ImageView imageView = view.findViewById(R.id.autofill_inline_suggestion_start_icon);
166-
assertTrue(((Animatable) imageView.getDrawable()).isRunning());
167-
}
168-
169153
@Test
170154
public void testRender_singleIcon_defaultStyle() {
171155
InlineSuggestionUi.Style style = mStyleBuilder.build();

‎autofill/autofill/src/androidTest/res/drawable/ic_animation.xml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎autofill/autofill/src/main/java/androidx/autofill/inline/v1/InlineSuggestionUi.java‎

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import android.app.slice.SliceItem;
2828
import android.content.Context;
2929
import android.content.res.Resources;
30-
import android.graphics.drawable.Animatable;
31-
import android.graphics.drawable.Drawable;
3230
import android.graphics.drawable.Icon;
3331
import android.os.Build;
3432
import android.os.Bundle;
@@ -286,8 +284,16 @@ public final class InlineSuggestionUi {
286284
subtitleView.setText(subtitle);
287285
subtitleView.setVisibility(View.VISIBLE);
288286
}
289-
setImageIcon(startIconView, content.getStartIcon());
290-
setImageIcon(endIconView, content.getEndIcon());
287+
final Icon startIcon = content.getStartIcon();
288+
if (startIcon != null) {
289+
startIconView.setImageIcon(startIcon);
290+
startIconView.setVisibility(View.VISIBLE);
291+
}
292+
final Icon endIcon = content.getEndIcon();
293+
if (endIcon != null) {
294+
endIconView.setImageIcon(endIcon);
295+
endIconView.setVisibility(View.VISIBLE);
296+
}
291297
final CharSequence contentDescription = content.getContentDescription();
292298
if (!TextUtils.isEmpty(contentDescription)) {
293299
suggestionView.setContentDescription(contentDescription);
@@ -304,18 +310,6 @@ public final class InlineSuggestionUi {
304310
return suggestionView;
305311
}
306312

307-
private static void setImageIcon(@NonNull ImageView imageView, @Nullable Icon icon) {
308-
if (icon == null) {
309-
return;
310-
}
311-
imageView.setImageIcon(icon);
312-
final Drawable drawable = imageView.getDrawable();
313-
if (drawable instanceof Animatable) {
314-
((Animatable) drawable).start();
315-
}
316-
imageView.setVisibility(View.VISIBLE);
317-
}
318-
319313
/**
320314
* @see androidx.autofill.inline.Renderer#getAttributionIntent(Slice)
321315
* @see Content#getAttributionIntent()

‎benchmark/benchmark-macro/src/androidTest/java/androidx/benchmark/macro/perfetto/PerfettoSdkHandshakeTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import org.junit.runner.RunWith
4848
import org.junit.runners.Parameterized
4949
import org.junit.runners.Parameterized.Parameters
5050

51-
private const val tracingPerfettoVersion = "1.0.1" // TODO(224510255): get by 'reflection'
51+
private const val tracingPerfettoVersion = "1.0.0" // TODO(224510255): get by 'reflection'
5252
private const val minSupportedSdk = Build.VERSION_CODES.R // TODO(234351579): Support API < 30
5353

5454
@RunWith(Parameterized::class)

‎car/app/app-samples/showcase/common/src/main/res/values-b+sr+Latn/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<string name="settings_action_title" msgid="8616900063253887861">"Podešavanja"</string>
3939
<string name="accept_action_title" msgid="4899660585470647578">"Prihvatam"</string>
4040
<string name="reject_action_title" msgid="6730366705938402668">"Odbij"</string>
41-
<string name="ok_action_title" msgid="7128494973966098611">"Važi"</string>
41+
<string name="ok_action_title" msgid="7128494973966098611">"Potvrdi"</string>
4242
<string name="throw_action_title" msgid="7163710562670220163">"Baci"</string>
4343
<string name="commute_action_title" msgid="2585755255290185096">"Redovno putovanje"</string>
4444
<string name="sign_out_action_title" msgid="1653943000866713010">"Odjavite se"</string>

‎car/app/app-samples/showcase/common/src/main/res/values-fa/strings.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -262,16 +262,16 @@
262262
<string name="sign_in_complete_text" msgid="8423984266325680606">"به سیستم وارد شدید!"</string>
263263
<string name="sign_in_complete_title" msgid="8919868148773983428">"ورود به سیستم تکمیل شد"</string>
264264
<string name="sign_in_template_demo_title" msgid="6052035424941410249">"الگوی ورود به سیستم نمونه"</string>
265-
<string name="tab_template_layouts_demo_title" msgid="6529681462424538165">"نمونه‌های الگوی زبانه"</string>
266-
<string name="tab_template_demo_title" msgid="7587839101813629975">"نمونه الگوی زبانه"</string>
267-
<string name="tab_title_message" msgid="5266710951630087246">"زبانه پیام"</string>
268-
<string name="tab_title_pane" msgid="2520606145526537263">"زبانه قاب"</string>
269-
<string name="tab_title_list" msgid="5104962518489668123">"زبانه فهرست"</string>
270-
<string name="tab_title_grid" msgid="5268168907976325154">"زبانه جدول با عنوان زبانه طولانی"</string>
271-
<string name="tab_title_search" msgid="1892925693146631173">"زبانه جستجو"</string>
272-
<string name="tab_title_loading" msgid="5385807479734490989">"درحال بار کردن «زبانه»"</string>
273-
<string name="tab_template_loading_demo_title" msgid="4638051615030345574">"نمونه بارگیری الگوی زبانه"</string>
274-
<string name="tab_template_no_tabs_demo_title" msgid="6907466201298082309">"نمونه عدم وجود زبانه الگوی زبانه"</string>
265+
<string name="tab_template_layouts_demo_title" msgid="6529681462424538165">"نمونه‌های الگوی برگه"</string>
266+
<string name="tab_template_demo_title" msgid="7587839101813629975">"نمونه الگوی برگه"</string>
267+
<string name="tab_title_message" msgid="5266710951630087246">"برگه پیام"</string>
268+
<string name="tab_title_pane" msgid="2520606145526537263">"برگه قاب"</string>
269+
<string name="tab_title_list" msgid="5104962518489668123">"برگه فهرست"</string>
270+
<string name="tab_title_grid" msgid="5268168907976325154">"برگه جدول با عنوان برگه طولانی"</string>
271+
<string name="tab_title_search" msgid="1892925693146631173">"برگه جستجو"</string>
272+
<string name="tab_title_loading" msgid="5385807479734490989">"درحال بار کردن «برگه»"</string>
273+
<string name="tab_template_loading_demo_title" msgid="4638051615030345574">"نمونه بارگیری الگوی برگه"</string>
274+
<string name="tab_template_no_tabs_demo_title" msgid="6907466201298082309">"نمونه عدم وجود برگه الگوی برگه"</string>
275275
<string name="images_unknown_host_error" msgid="3180661817432720076">"به‌دلیل نامشخص بودن میزبان، تصویر نمایش داده نمی‌شود"</string>
276276
<string name="icon_title_prefix" msgid="8487026131229541244">"نماد"</string>
277277
<string name="content_provider_icons_demo_title" msgid="5708602618664311097">"نمونه نمادهای ارائه‌دهنده محتوا"</string>

‎car/app/app-samples/showcase/common/src/main/res/values-sr/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<string name="settings_action_title" msgid="8616900063253887861">"Подешавања"</string>
3939
<string name="accept_action_title" msgid="4899660585470647578">"Прихватам"</string>
4040
<string name="reject_action_title" msgid="6730366705938402668">"Одбиј"</string>
41-
<string name="ok_action_title" msgid="7128494973966098611">"Важи"</string>
41+
<string name="ok_action_title" msgid="7128494973966098611">"Потврди"</string>
4242
<string name="throw_action_title" msgid="7163710562670220163">"Баци"</string>
4343
<string name="commute_action_title" msgid="2585755255290185096">"Редовно путовање"</string>
4444
<string name="sign_out_action_title" msgid="1653943000866713010">"Одјавите се"</string>

‎compose/material3/adaptive/adaptive-layout/src/androidMain/res/values-af/strings.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
<resources xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
20-
<string name="m3_adaptive_default_pane_title_primary" msgid="4435202124665670898">"Primêre paneel"</string>
21-
<string name="m3_adaptive_default_pane_title_secondary" msgid="5571153069654173825">"Sekondêre paneel"</string>
22-
<string name="m3_adaptive_default_pane_title_tertiary" msgid="4618411484428250300">"Tersiêre paneel"</string>
2320
<string name="m3_adaptive_default_pane_expansion_drag_handle_content_description" msgid="9058489142432490820">"Sleephandvatsel van paneeluitbreiding"</string>
2421
<string name="m3_adaptive_default_pane_expansion_drag_handle_state_description" msgid="3470811934112444098">"Huidige paneelverdeling, %s"</string>
2522
<string name="m3_adaptive_default_pane_expansion_drag_handle_action_description" msgid="9031621431415014327">"Verander paneelverdeling na %s"</string>

‎compose/material3/adaptive/adaptive-layout/src/androidMain/res/values-am/strings.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
<resources xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
20-
<string name="m3_adaptive_default_pane_title_primary" msgid="4435202124665670898">"ዋና ፔን"</string>
21-
<string name="m3_adaptive_default_pane_title_secondary" msgid="5571153069654173825">"ሁለተኛ ፔን"</string>
22-
<string name="m3_adaptive_default_pane_title_tertiary" msgid="4618411484428250300">"ሦስተኛ ፔን"</string>
2320
<string name="m3_adaptive_default_pane_expansion_drag_handle_content_description" msgid="9058489142432490820">"የፔን መዘርጋት መያዣ ይጎትቱ"</string>
2421
<string name="m3_adaptive_default_pane_expansion_drag_handle_state_description" msgid="3470811934112444098">"የአሁን ፔን መከፋፈል፣ %s"</string>
2522
<string name="m3_adaptive_default_pane_expansion_drag_handle_action_description" msgid="9031621431415014327">"ፔን መከፋፈልን ወደ %s ይለውጡ"</string>

‎compose/material3/adaptive/adaptive-layout/src/androidMain/res/values-ar/strings.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717

1818
<resources xmlns:android="http://schemas.android.com/apk/res/android"
1919
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
20-
<string name="m3_adaptive_default_pane_title_primary" msgid="4435202124665670898">"اللوحة الأساسية"</string>
21-
<string name="m3_adaptive_default_pane_title_secondary" msgid="5571153069654173825">"اللوحة الثانوية"</string>
22-
<string name="m3_adaptive_default_pane_title_tertiary" msgid="4618411484428250300">"اللوحة التكميلية"</string>
2320
<string name="m3_adaptive_default_pane_expansion_drag_handle_content_description" msgid="9058489142432490820">"مقبض السحب لتوسيع اللوحة"</string>
2421
<string name="m3_adaptive_default_pane_expansion_drag_handle_state_description" msgid="3470811934112444098">"‏حالة تقسيم اللوحة الحالية: %s"</string>
2522
<string name="m3_adaptive_default_pane_expansion_drag_handle_action_description" msgid="9031621431415014327">"‏تغيير نسبة تقسيم اللوحة إلى %s"</string>

0 commit comments

Comments
 (0)