Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d8d0e2f2: Sync with jb-mr1-dev

Browse Source 
* commit 'd8d0e2f2b572d194b29f4b4f47669854a1c438c4':
  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
This commit is contained in:
The Android Open Source Project
2012-07-31 08:28:37 -07:00
committed by Android Git Automerger
parent f415f3d72b d8d0e2f2b5
commit 9ead33be76
9 changed files with 48049 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48037
api/17.txt Normal file
View File

File diff suppressed because it is too large Load Diff

1
api/current.txt
View File

@@ -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 {

7
core/java/android/os/Build.java
View File

@@ -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". */

2
core/res/res/values-w720dp/bools.xml
View File

@@ -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>

4
docs/html/about/versions/android-4.0.jd
View File

@@ -1,4 +1,6 @@
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">

BIN
docs/html/design/media/actionbar_drawer.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

BIN
docs/html/design/media/dialogs_popups_example.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 138 KiB

After

Width:  |  Height:  |  Size: 130 KiB

BIN
docs/html/design/media/tabs_youtube.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 67 KiB

After

Width:  |  Height:  |  Size: 28 KiB

7
docs/html/design/patterns/actionbar.jd
View File

@@ -234,12 +234,7 @@ tabs. Fixed tabs in the main action bar can move to the top bar when the screen
</div>
<div class="layout-content-col span-7">
<img src="{@docRoot}design/media/action_bar_pattern_default_tabs.png">
<div class="figure-caption">
Default fixed tabs shown in Holo Dark &amp; Light.
</div>
<img src="{@docRoot}design/media/actionbar_drawer.png">
</div>
</div>