diff options
| author | Hongwei Wang <hwwang@google.com> | 2020-10-28 19:38:11 +0000 |
|---|---|---|
| committer | Hongwei Wang <hwwang@google.com> | 2020-10-28 20:16:22 +0000 |
| commit | 050275cd83f4a66dc3705714ccbe8db025626ce8 (patch) | |
| tree | 9c941a44b9f1ba83bbd13fe25716c94727a06035 /core/java/android/widget/ActionMenuView.java | |
| parent | 72f07d6a8a32db4a0dedd7682a0b3385be2b9cd6 (diff) | |
Revert "Add maxTargetSdk restriction to unused APIs."
This reverts commit 72f07d6a8a32db4a0dedd7682a0b3385be2b9cd6.
Reason for revert: Droidcop-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?testMethod=testAppZygotePreload&testClass=android.app.cts.ServiceTest&atpConfigName=suite%2Ftest-mapping-presubmit-retry_cloud-tf&testModule=CtsAppTestCases&fkbb=6936597&lkbb=6936969&lkgb=6936551&testResults=true&branch=git_master&target=cf_x86_phone-userdebug>, bug b/171886397
Bug: 171886397
Change-Id: Ibe0f0430a3451477c1ee8ef56a596e91ea1e7672
Diffstat (limited to 'core/java/android/widget/ActionMenuView.java')
| -rw-r--r-- | core/java/android/widget/ActionMenuView.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/core/java/android/widget/ActionMenuView.java b/core/java/android/widget/ActionMenuView.java index f83ff305cfdc..3a743562110f 100644 --- a/core/java/android/widget/ActionMenuView.java +++ b/core/java/android/widget/ActionMenuView.java @@ -22,7 +22,6 @@ import android.compat.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Configuration; import android.graphics.drawable.Drawable; -import android.os.Build; import android.util.AttributeSet; import android.view.ContextThemeWrapper; import android.view.Gravity; @@ -720,7 +719,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo * @hide Private LinearLayout (superclass) API. Un-hide if LinearLayout API is made public. */ @Override - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage protected boolean hasDividerBeforeChildAt(int childIndex) { if (childIndex == 0) { return false; @@ -791,7 +790,7 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo /** @hide */ public interface ActionMenuChildView { - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean needsDividerBefore(); public boolean needsDividerAfter(); } @@ -799,31 +798,31 @@ public class ActionMenuView extends LinearLayout implements MenuBuilder.ItemInvo public static class LayoutParams extends LinearLayout.LayoutParams { /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean isOverflowButton; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int cellsUsed; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public int extraPixels; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean expandable; /** @hide */ @ViewDebug.ExportedProperty(category = "layout") - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean preventEdgeOffset; /** @hide */ - @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553) + @UnsupportedAppUsage public boolean expanded; public LayoutParams(Context c, AttributeSet attrs) { |