diff options
| author | Charles Chen <charlesccchen@google.com> | 2019-07-30 17:21:47 +0800 |
|---|---|---|
| committer | Charles Chen <charlesccchen@google.com> | 2019-08-01 10:51:22 +0800 |
| commit | 5c0943dbb0b642602add6c09dddb2d8ddb6fcd0b (patch) | |
| tree | f16ddbb4fd57dd7bf38c203e726479ee26250da5 /core/java/android | |
| parent | 28a0e47963845bb70f8a55323a358f049ff49ee6 (diff) | |
Add max target sdk for ActivityGroup related APIs
Test: build and presubmit
Bug: 137825207
Change-Id: Ie3125743b46e785bf3f5655518e5634da2f578b0
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | core/java/android/widget/TabHost.java | 42 | ||||
| -rw-r--r-- | core/java/android/widget/TabWidget.java | 18 |
3 files changed, 53 insertions, 11 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index f655c8993456..d6059647826b 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -808,7 +808,9 @@ public class Activity extends ContextThemeWrapper /*package*/ ActivityInfo mActivityInfo; @UnsupportedAppUsage /*package*/ ActivityThread mMainThread; - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.fragment.app.Fragment} and " + + "{@code androidx.fragment.app.FragmentManager} instead") Activity mParent; @UnsupportedAppUsage boolean mCalled; diff --git a/core/java/android/widget/TabHost.java b/core/java/android/widget/TabHost.java index 90cb1c8dfa03..45e635ebe011 100644 --- a/core/java/android/widget/TabHost.java +++ b/core/java/android/widget/TabHost.java @@ -59,13 +59,21 @@ public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchMode private static final int TABWIDGET_LOCATION_BOTTOM = 3; private TabWidget mTabWidget; private FrameLayout mTabContent; - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.viewpager.widget.ViewPager} and " + + "{@code com.google.android.material.tabs.TabLayout} instead.\n" + + "See <a href=\"{@docRoot}guide/navigation/navigation-swipe-view" + + "\">TabLayout and ViewPager</a>") private List<TabSpec> mTabSpecs = new ArrayList<TabSpec>(2); /** * This field should be made private, so it is hidden from the SDK. * {@hide} */ - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.viewpager.widget.ViewPager} and " + + "{@code com.google.android.material.tabs.TabLayout} instead.\n" + + "See <a href=\"{@docRoot}guide/navigation/navigation-swipe-view" + + "\">TabLayout and ViewPager</a>") protected int mCurrentTab = -1; private View mCurrentView = null; /** @@ -73,7 +81,11 @@ public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchMode * {@hide} */ protected LocalActivityManager mLocalActivityManager = null; - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.viewpager.widget.ViewPager} and " + + "{@code com.google.android.material.tabs.TabLayout} instead.\n" + + "See <a href=\"{@docRoot}guide/navigation/navigation-swipe-view" + + "\">TabLayout and ViewPager</a>") private OnTabChangeListener mOnTabChangeListener; private OnKeyListener mTabKeyListener; @@ -514,9 +526,17 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); private final @NonNull String mTag; - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.viewpager.widget.ViewPager} and " + + "{@code com.google.android.material.tabs.TabLayout} instead.\n" + + "See <a href=\"{@docRoot}guide/navigation/navigation-swipe-view" + + "\">TabLayout and ViewPager</a>") private IndicatorStrategy mIndicatorStrategy; - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.viewpager.widget.ViewPager} and " + + "{@code com.google.android.material.tabs.TabLayout} instead.\n" + + "See <a href=\"{@docRoot}guide/navigation/navigation-swipe-view" + + "\">TabLayout and ViewPager</a>") private ContentStrategy mContentStrategy; /** @@ -779,7 +799,11 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); mIntent = intent; } - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.viewpager.widget.ViewPager} and " + + "{@code com.google.android.material.tabs.TabLayout} instead.\n" + + "See <a href=\"{@docRoot}guide/navigation/navigation-swipe-view" + + "\">TabLayout and ViewPager</a>") public View getContentView() { if (mLocalActivityManager == null) { throw new IllegalStateException("Did you forget to call 'public void setup(LocalActivityManager activityGroup)'?"); @@ -809,7 +833,11 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1"); return mLaunchedView; } - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.viewpager.widget.ViewPager} and " + + "{@code com.google.android.material.tabs.TabLayout} instead.\n" + + "See <a href=\"{@docRoot}guide/navigation/navigation-swipe-view" + + "\">TabLayout and ViewPager</a>") public void tabClosed() { if (mLaunchedView != null) { mLaunchedView.setVisibility(View.GONE); diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java index 434a79970499..bd0d039fb7f0 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -65,7 +65,11 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { private OnTabSelectionChanged mSelectionChangedListener; // This value will be set to 0 as soon as the first tab is added to TabHost. - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.viewpager.widget.ViewPager} and " + + "{@code com.google.android.material.tabs.TabLayout} instead.\n" + + "See <a href=\"{@docRoot}guide/navigation/navigation-swipe-view" + + "\">TabLayout and ViewPager</a>") private int mSelectedTab = -1; @Nullable @@ -74,7 +78,11 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { @Nullable private Drawable mRightStrip; - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.viewpager.widget.ViewPager} and " + + "{@code com.google.android.material.tabs.TabLayout} instead.\n" + + "See <a href=\"{@docRoot}guide/navigation/navigation-swipe-view" + + "\">TabLayout and ViewPager</a>") private boolean mDrawBottomStrips = true; private boolean mStripMoved; @@ -551,7 +559,11 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { * Provides a way for {@link TabHost} to be notified that the user clicked * on a tab indicator. */ - @UnsupportedAppUsage + @UnsupportedAppUsage(trackingBug = 137825207, maxTargetSdk = Build.VERSION_CODES.Q, + publicAlternatives = "Use {@code androidx.viewpager.widget.ViewPager} and " + + "{@code com.google.android.material.tabs.TabLayout} instead.\n" + + "See <a href=\"{@docRoot}guide/navigation/navigation-swipe-view" + + "\">TabLayout and ViewPager</a>") void setTabSelectionListener(OnTabSelectionChanged listener) { mSelectionChangedListener = listener; } |
