Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f9d9695 authored by Andrew Solovay's avatar Andrew Solovay Committed by android-build-merger
Browse files

Merge "docs: Made javadoc references less ambiguous" into mnc-docs 

am: fe37d43d

* commit 'fe37d43d':
  docs: Made javadoc references less ambiguous
parents 1da20a83 fe37d43d

docs/html/about/versions/marshmallow/android-6.0.jd

+6 −6
Original line number Diff line number Diff line
@@ -406,12 +406,12 @@ mode, the UI continues to be rendered at the original resolution (such as 1080p) 
<h2 id="behavior-themeable-colorstatelists">Themeable ColorStateLists</h2>

<p>Theme attributes are now supported in

{@link android.content.res.ColorStateList} for devices running on Android 6.0 (API level 23). The

{@link android.content.res.Resources#getColorStateList(int) getColorStateList()} and

{@link android.content.res.Resources#getColor(int) getColor()} methods have been deprecated. If

you are calling these APIs, call the new

{@link android.content.Context#getColorStateList(int) getColorStateList()} or

{@link android.content.Context#getColor(int) getColor()} methods instead. These methods are also

available in the v4 appcompat library via {@link android.support.v4.content.ContextCompat}.</p>

{@link android.content.res.Resources#getColorStateList(int) Resources.getColorStateList()} and

{@link android.content.res.Resources#getColor(int) Resources.getColor()} methods have been

deprecated. If you are calling these APIs, call the new

{@link android.content.Context#getColorStateList(int) Context.getColorStateList()} or

{@link android.content.Context#getColor(int) Context.getColor()} methods instead. These methods are

also available in the v4 appcompat library via {@link android.support.v4.content.ContextCompat}.</p>



<h2 id="audio">Audio Features</h2>