summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--core/java/com/android/internal/app/PlatLogoActivity.java24
-rw-r--r--docs/html/about/versions/android-5.0.jd7
-rw-r--r--docs/html/about/versions/lollipop.jd2
-rw-r--r--docs/html/google/play/billing/billing_reference.jd5
-rw-r--r--docs/html/guide/components/recents.jd10
-rw-r--r--tools/aapt/Images.cpp2
6 files changed, 38 insertions, 12 deletions
diff --git a/core/java/com/android/internal/app/PlatLogoActivity.java b/core/java/com/android/internal/app/PlatLogoActivity.java
index f92fd55..80bc5fe 100644
--- a/core/java/com/android/internal/app/PlatLogoActivity.java
+++ b/core/java/com/android/internal/app/PlatLogoActivity.java
@@ -36,6 +36,7 @@ import android.provider.Settings;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Gravity;
+import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewOutlineProvider;
@@ -54,6 +55,7 @@ public class PlatLogoActivity extends Activity {
};
FrameLayout mLayout;
int mTapCount;
+ int mKeyCount;
PathInterpolator mInterpolator = new PathInterpolator(0f, 0f, 0.5f, 1f);
static int newColorIndex() {
@@ -203,6 +205,28 @@ public class PlatLogoActivity extends Activity {
}
});
+ // Enable hardware keyboard input for TV compatibility.
+ im.setFocusable(true);
+ im.requestFocus();
+ im.setOnKeyListener(new View.OnKeyListener() {
+ @Override
+ public boolean onKey(View v, int keyCode, KeyEvent event) {
+ if (keyCode != KeyEvent.KEYCODE_BACK && event.getAction() == KeyEvent.ACTION_DOWN) {
+ ++mKeyCount;
+ if (mKeyCount > 2) {
+ if (mTapCount > 5) {
+ im.performLongClick();
+ } else {
+ im.performClick();
+ }
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
+ });
+
mLayout.addView(im, new FrameLayout.LayoutParams(size, size, Gravity.CENTER));
im.animate().scaleX(0.3f).scaleY(0.3f)
diff --git a/docs/html/about/versions/android-5.0.jd b/docs/html/about/versions/android-5.0.jd
index 4f9066c..874262c 100644
--- a/docs/html/about/versions/android-5.0.jd
+++ b/docs/html/about/versions/android-5.0.jd
@@ -426,12 +426,9 @@ the persistence behavior, use the
<a href="{@docRoot}reference/android/R.attr.html#persistableMode">android:persistableMode</a>
attribute. You can also change
the visual properties of an activity in the recents screen, such as the
-activity’s color, label, and icon. To do this, make sure the
-<a href="{@docRoot}reference/android/R.attr.html#relinquishTaskIdentity">android:relinquishTaskIdentity</a>
-attribute of the task’s root activity is set
-to {@code true}. You can then use the
+activity’s color, label, and icon, by calling the
{@link android.app.Activity#setTaskDescription(android.app.ActivityManager.TaskDescription) setTaskDescription()}
-method to set its appearance properties.</p>
+method.</p>
<h3 id="WebView">WebView updates</h3>
<p>Android 5.0 updates the {@link android.webkit.WebView}
diff --git a/docs/html/about/versions/lollipop.jd b/docs/html/about/versions/lollipop.jd
index 757f148..59392ea 100644
--- a/docs/html/about/versions/lollipop.jd
+++ b/docs/html/about/versions/lollipop.jd
@@ -172,7 +172,7 @@ video apps and games to display smooth synchronized content.</p>
<div class="figure" style="width:350px; margin:0 0 0 60px">
<img src="{@docRoot}images/versions/rivalknights.png" style="float:right;" width="350" height="525" />
-<p class="img-caption">Gameloft's Rival Knights uses ASTC from AEP and Compute Shaders from ES 3.1 to deliver HDR Bloom effects and provide more graphical detail.</p>
+<p class="img-caption">Gameloft's Rival Knights uses ASTC (Adaptive Scalable Texture Compression) from AEP and Compute Shaders from ES 3.1 to deliver HDR (High Dynamic Range) Bloom effects and provide more graphical detail.</p>
</div>
<p>Android 5.0 also introduces the <strong>Android Extension Pack</strong> (AEP), a set of OpenGL ES extensions that give you access to features like tessellation shaders, geometry shaders, ASTC texture compression, per-sample interpolation and shading, and other advanced rendering capabilities. With AEP you can deliver high-performance graphics across a range of GPUs.</p>
diff --git a/docs/html/google/play/billing/billing_reference.jd b/docs/html/google/play/billing/billing_reference.jd
index 4d80964..902c2c6 100644
--- a/docs/html/google/play/billing/billing_reference.jd
+++ b/docs/html/google/play/billing/billing_reference.jd
@@ -52,6 +52,11 @@ parent.link=index.html
<td>User pressed back or canceled a dialog</td>
</tr>
<tr>
+ <td>{@code BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE}</td>
+ <td>2</td>
+ <td>Network connection is down</td>
+ </tr>
+ <tr>
<td>{@code BILLING_RESPONSE_RESULT_BILLING_UNAVAILABLE}</td>
<td>3</td>
<td>Billing API version is not supported for the type requested</td>
diff --git a/docs/html/guide/components/recents.jd b/docs/html/guide/components/recents.jd
index b44c682..78cc6ac 100644
--- a/docs/html/guide/components/recents.jd
+++ b/docs/html/guide/components/recents.jd
@@ -30,7 +30,7 @@ page.tags="recents","overview"
<h2>Sample code</h2>
<ol>
- <li><a href="{@docRoot}samples/activitytasks/index.html">Document-centric Apps</a></li>
+ <li><a href="{@docRoot}samples/DocumentCentricApps/index.html">Document-centric Apps</a></li>
</ol>
</div>
@@ -84,7 +84,7 @@ the new document, the system always creates a new task with the target activity
This setting allows the same document to be opened in more than one task. The following code demonstrates
how the main activity does this:</p>
-<p class="code-caption"><a href="{@docRoot}samples/activitytasks/src/com/example/android/documentcentricrecents/DocumentCentricActivity.html">
+<p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
DocumentCentricActivity.java</a></p>
<pre>
public void createNewDocument(View view) {
@@ -122,7 +122,7 @@ to the front and passes the new intent to {@link android.app.Activity#onNewInten
The new activity gets the intent and creates a new document in the overview screen, as in the
following example:</p>
-<p class="code-caption"><a href="{@docRoot}samples/activitytasks/src/com/example/android/documentcentricrecents/NewDocumentActivity.html">
+<p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
NewDocumentActivity.java</a></p>
<pre>
&#64;Override
@@ -209,7 +209,7 @@ is 50 (25 on low memory devices); values less than 1 are not valid.</p>
specify when to remove the task and finish all activities associated with it by calling
the {@link android.app.ActivityManager.AppTask#finishAndRemoveTask() finishAndRemoveTask()} method.</p>
-<p class="code-caption"><a href="{@docRoot}samples/activitytasks/index.html">
+<p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
NewDocumentActivity.java</a></p>
<pre>
public void onRemoveFromRecents(View view) {
@@ -229,7 +229,7 @@ discussed below.</p>
the {@link android.content.Intent#FLAG_ACTIVITY_RETAIN_IN_RECENTS} flag in the
{@link android.content.Intent#addFlags(int) addFlags()} method of the Intent that launches the activity.</p>
-<p class="code-caption"><a href="{@docRoot}samples/activitytasks/src/com/example/android/documentcentricrecents/DocumentCentricActivity.html">
+<p class="code-caption"><a href="{@docRoot}samples/DocumentCentricApps/index.html">
DocumentCentricActivity.java</a></p>
<pre>
private Intent newDocumentIntent() {
diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp
index 56d1650..5d4a6ac 100644
--- a/tools/aapt/Images.cpp
+++ b/tools/aapt/Images.cpp
@@ -1491,7 +1491,7 @@ status_t postProcessImage(const Bundle* bundle, const sp<AaptAssets>& assets,
// At this point, now that we have all the resource data, all we need to
// do is compile XML files.
if (strcmp(ext.string(), ".xml") == 0) {
- String16 resourceName(parseResourceName(file->getPath().getPathLeaf()));
+ String16 resourceName(parseResourceName(file->getSourceFile().getPathLeaf()));
return compileXmlFile(bundle, assets, resourceName, file, table);
}
generated by cgit v1.1 at 2025-10-20 22:31:42 +0000