Merge "Deprecate FragmentBreadCrumbs, remove styles add in L" (22827a7f) · Commits · e / os / android_frameworks_base

api/current.txt

+281 −289

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/app/FragmentBreadCrumbs.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -37,7 +37,10 @@ import android.widget.TextView;
		*
		* <p>The default style for this view is
		* {@link android.R.style#Widget_FragmentBreadCrumbs}.
		*
		* @deprecated This widget is no longer supported.
		*/
		@Deprecated
		public class FragmentBreadCrumbs extends ViewGroup
		implements FragmentManager.OnBackStackChangedListener {
		Activity mActivity;
		@@ -88,6 +91,9 @@ public class FragmentBreadCrumbs extends ViewGroup
		this(context, attrs, defStyleAttr, 0);
		}

		/**
		* @hide
		*/
		public FragmentBreadCrumbs(
		Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);

core/res/res/values/attrs.xml

+3 −1

Original line number	Diff line number	Diff line
		@@ -657,7 +657,9 @@
		<attr name="popupMenuStyle" format="reference" />
		<!-- Default StackView style. -->
		<attr name="stackViewStyle" format="reference" />
		<!-- Default style for the FragmentBreadCrumbs widget. -->

		<!-- Default style for the FragmentBreadCrumbs widget. This widget is deprecated
		starting in API level 21 ({@link android.os.Build.VERSION_CODES#.L}). -->
		<attr name="fragmentBreadCrumbsStyle" format="reference" />

		<!-- NumberPicker style. -->

core/res/res/values/public.xml

+0 −7

Original line number	Diff line number	Diff line
		@@ -2104,7 +2104,6 @@

		<public-padding type="attr" name="l_resource_pad" end="0x1010410" />

		<public type="attr" name="fragmentBreadCrumbsStyle" />
		<public type="attr" name="fastScrollStyle" />
		<public type="attr" name="windowContentTransitions" />
		<public type="attr" name="windowContentTransitionManager" />
		@@ -2195,20 +2194,16 @@
		<public type="style" name="Widget.StackView" />

		<public type="style" name="Widget.Holo.FastScroll" />
		<public type="style" name="Widget.Holo.FragmentBreadCrumbs" />
		<public type="style" name="Widget.Holo.StackView" />

		<public type="style" name="Widget.Holo.Light.Button.Borderless" />
		<public type="style" name="Widget.Holo.Light.FastScroll" />
		<public type="style" name="Widget.Holo.Light.FragmentBreadCrumbs" />
		<public type="style" name="Widget.Holo.Light.StackView" />

		<public type="style" name="Widget.DeviceDefault.FastScroll" />
		<public type="style" name="Widget.DeviceDefault.FragmentBreadCrumbs" />
		<public type="style" name="Widget.DeviceDefault.StackView" />

		<public type="style" name="Widget.DeviceDefault.Light.FastScroll" />
		<public type="style" name="Widget.DeviceDefault.Light.FragmentBreadCrumbs" />
		<public type="style" name="Widget.DeviceDefault.Light.StackView" />

		<public type="style" name="TextAppearance.Quantum" />
		@@ -2313,7 +2308,6 @@
		<public type="style" name="Widget.Quantum.EditText" />
		<public type="style" name="Widget.Quantum.ExpandableListView" />
		<public type="style" name="Widget.Quantum.FastScroll" />
		<public type="style" name="Widget.Quantum.FragmentBreadCrumbs" />
		<public type="style" name="Widget.Quantum.GridView" />
		<public type="style" name="Widget.Quantum.HorizontalScrollView" />
		<public type="style" name="Widget.Quantum.ImageButton" />
		@@ -2373,7 +2367,6 @@
		<public type="style" name="Widget.Quantum.Light.EditText" />
		<public type="style" name="Widget.Quantum.Light.ExpandableListView" />
		<public type="style" name="Widget.Quantum.Light.FastScroll" />
		<public type="style" name="Widget.Quantum.Light.FragmentBreadCrumbs" />
		<public type="style" name="Widget.Quantum.Light.GridView" />
		<public type="style" name="Widget.Quantum.Light.HorizontalScrollView" />
		<public type="style" name="Widget.Quantum.Light.ImageButton" />

core/res/res/values/styles_device_defaults.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -91,7 +91,8 @@ easier.
		<style name="Widget.DeviceDefault.CompoundButton.Switch" parent="Widget.Quantum.CompoundButton.Switch"/>
		<style name="Widget.DeviceDefault.ExpandableListView.White" parent="Widget.Quantum.ExpandableListView.White"/>
		<style name="Widget.DeviceDefault.FastScroll" parent="Widget.Quantum.FastScroll"/>
		<style name="Widget.DeviceDefault.FragmentBreadCrumbs" parent="Widget.Quantum.FragmentBreadCrumbs"/>
		<!-- The FragmentBreadCrumbs widget is deprecated starting in API level 21 ({@link android.os.Build.VERSION_CODES#.L}). -->
		<style name="Widget.DeviceDefault.FragmentBreadCrumbs" parent="Widget.Holo.FragmentBreadCrumbs"/>
		<style name="Widget.DeviceDefault.Gallery" parent="Widget.Quantum.Gallery"/>
		<style name="Widget.DeviceDefault.GestureOverlayView" parent="Widget.Quantum.GestureOverlayView"/>
		<style name="Widget.DeviceDefault.ImageWell" parent="Widget.Quantum.ImageWell"/>
		@@ -130,7 +131,8 @@ easier.
		<style name="Widget.DeviceDefault.Light.EditText" parent="Widget.Quantum.Light.EditText"/>
		<style name="Widget.DeviceDefault.Light.ExpandableListView" parent="Widget.Quantum.Light.ExpandableListView"/>
		<style name="Widget.DeviceDefault.Light.FastScroll" parent="Widget.Quantum.Light.FastScroll"/>
		<style name="Widget.DeviceDefault.Light.FragmentBreadCrumbs" parent="Widget.Quantum.Light.FragmentBreadCrumbs"/>
		<!-- The FragmentBreadCrumbs widget is deprecated starting in API level 21 ({@link android.os.Build.VERSION_CODES#.L}). -->
		<style name="Widget.DeviceDefault.Light.FragmentBreadCrumbs" parent="Widget.Holo.Light.FragmentBreadCrumbs"/>
		<style name="Widget.DeviceDefault.Light.GridView" parent="Widget.Quantum.Light.GridView"/>
		<style name="Widget.DeviceDefault.Light.ImageButton" parent="Widget.Quantum.Light.ImageButton"/>
		<style name="Widget.DeviceDefault.Light.ListView" parent="Widget.Quantum.Light.ListView"/>