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

Commit 9ead33be authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am d8d0e2f2: Sync with jb-mr1-dev 

* commit 'd8d0e2f2':
  Tentertively enable notification ime switcher
  Doc change: fix title and API level reference.
  actionbar and tabs image updates
  New API level 17 for JB MR1.
  dialog example update
parents f415f3d7 d8d0e2f2

api/17.txt

0 → 100644
+48037 −0

File added.

Preview size limit exceeded, changes collapsed.

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -15542,6 +15542,7 @@ package android.os { 
    field public static final int ICE_CREAM_SANDWICH = 14; // 0xe

    field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf

    field public static final int JELLY_BEAN = 16; // 0x10

    field public static final int JELLY_BEAN_MR1 = 17; // 0x11

  }















  public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

























core/java/android/os/Build.java



+6
−1




























Original line number
Diff line number
Diff line








@@ -370,7 +370,7 @@ public class Build {













        public static final int ICE_CREAM_SANDWICH_MR1 = 15;































        /**













         * Android 4.1.













         * June 2012: Android 4.1.















         *















         * <p>Applications targeting this or a later release will get these















         * new changes in behavior:</p>










@@ -411,6 +411,11 @@ public class Build {













         * </ul>















         */















        public static final int JELLY_BEAN = 16;



























        /**













         * Moar jelly beans!













         */













        public static final int JELLY_BEAN_MR1 = 17;















    }















    















    /** The type of build, like "user" or "eng". */

































core/res/res/values-w720dp/bools.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -16,5 +16,5 @@





























<resources>















    <bool name="action_bar_expanded_action_views_exclusive">false</bool>













    <bool name="show_ongoing_ime_switcher">false</bool>













    <bool name="show_ongoing_ime_switcher">true</bool>















</resources>
























docs/html/about/versions/android-4.0.jd



+3
−1




























Original line number
Diff line number
Diff line













page.title=Android 4.1 API Overview













page.title=Android 4.0 Platform













sdk.platform.version=4.0













sdk.platform.apiLevel=14















@jd:body































<div id="qv-wrapper">